diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 5f499f3e8..e337eb3fe 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -1,6 +1,8 @@
 # TODO: Explain what some of this does..
+# For more information on keybindings, see http://zshwiki.org/home/zle/bindkeys
 
-bindkey -e
+#bindkey -e
+bindkey -v # vi keybindings
 bindkey '\ew' kill-region
 bindkey -s '\el' "ls\n"
 bindkey '^r' history-incremental-search-backward
@@ -25,10 +27,11 @@ bindkey "^[[1;5D" backward-word
 bindkey '^[[Z' reverse-menu-complete
 
 # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
+# default keybinding is normal US Keyboard (non-mac)
 bindkey '^?' backward-delete-char
 bindkey "^[[3~" delete-char
-bindkey "^[3;5~" delete-char
-bindkey "\e[3~" delete-char
+#bindkey "^[3;5~" delete-char
+#bindkey "\e[3~" delete-char
 
 # consider emacs keybindings:
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 154aa6db1..3146336df 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -38,8 +38,8 @@ compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcl='git config --list'
-alias gcp='git cherry-pick'
-compdef _git gcp=git-cherry-pick
+alias gchp='git cherry-pick'
+compdef _git gchp=git-cherry-pick
 alias glg='git log --stat --max-count=5'
 compdef _git glg=git-log
 alias glgg='git log --graph --max-count=5'