Index: zshrc
==================================================================
--- zshrc
+++ zshrc
@@ -57,13 +57,16 @@
 bindkey "^E" end-of-line
 bindkey "^D" delete-char-or-list
 # backward-kill-word behaves more like vim, whereas vi-backward-kill-word is
 # the vi behaviour.
 bindkey "^W" backward-kill-word
+# Otherwise not available at all in vi mode.
+bindkey "^P" insert-last-word
 
 setopt no_bg_nice
 setopt no_nomatch
+setopt no_bang_hist
 setopt extended_glob
 setopt autocd
 setopt auto_pushd
 
 autoload -U compinit
@@ -391,10 +394,14 @@
 
 if __has_command gpg gpg2; then
 	alias gssh='SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) ssh -o IdentitiesOnly=no'
 	alias gssh-add='SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) ssh-add'
 	alias gsftp='SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) sftp -o IdentitiesOnly=no'
+
+	if __has_command sshfs; then
+		alias gsshfs='SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) sshfs -o IdentitiesOnly=no'
+	fi
 fi
 
 if __has_command cryptopassphrase; then
 	pwnk() {
 		local clipboard