diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 23747d26a..8a17acb3f 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -503,41 +503,41 @@ _git_prompt__dirty_state ()
     _big_repo='yes'
     local line
     while IFS=$'\n' read line; do
-        if [[ "$line" =~ '^M' ]]; then
+        if [[ "$line" = M* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_MODIFIED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^A' ]]; then
+        if [[ "$line" = A* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_ADDED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^R' ]]; then
+        if [[ "$line" = R* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_RENAMED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^C' ]]; then
+        if [[ "$line" = C* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_COPIED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^D' ]]; then
+        if [[ "$line" = D* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_DELETED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
 
-        if [[ "$line" =~ '^\?\? ' ]]; then
+        if [[ "$line" = \?\?* ]]; then
             GIT_PROMPT_DIRTY_STATE_WORKTREE_UNTRACKED='yes'
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^ M' ]]; then
+        if [[ "$line" = \ M* ]]; then
             GIT_PROMPT_DIRTY_STATE_WORKTREE_MODIFIED='yes'
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^ D' ]]; then
+        if [[ "$line" = \ D* ]]; then
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DELETED='yes'
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes'
         fi
 
-        if [[ "$line" =~ '^UU' ]]; then
+        if [[ "$line" = UU* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_UNMERGED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fdcaf0e61..859b637c6 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -40,7 +40,7 @@ alias ghhhh="git log --graph --stat -p --full-diff $pretty_format_medium"; compd
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-compdef git-svn-dcommit-push=git
+compdef _git git-svn-dcommit-push=git
 
 #
 # Will return the current branch name
@@ -53,8 +53,8 @@ function current_branch() {
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
-compdef ggpull=git
+compdef _git ggpull=git
 alias ggpush='git push origin $(current_branch)'
-compdef ggpush=git
+compdef _git ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
+compdef _git ggpnp=git
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index aa39081f4..04229b7a1 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -14,10 +14,6 @@ if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$reset_color%}%{$fg[red]%}<<%{$reset_color%}"
 fi
 
-function zle-line-init zle-keymap-select {
-  zle reset-prompt
-}
-
 # If I am using vi keys, I want to know what mode I'm currently using.
 # zle-keymap-select is executed every time KEYMAP changes.
 # From http://zshwiki.org/home/examples/zlewidgets
@@ -67,9 +63,11 @@ else
 fi
 
 bindkey "^P"          up-line-or-search
+bindkey -M vicmd "k" up-line-or-search
 bindkey -M vicmd "^k" up-line-or-search
 bindkey -M viins "^k" up-line-or-search
 bindkey "^N"          down-line-or-search
+bindkey -M vicmd "j" down-line-or-search
 bindkey -M vicmd "^j" down-line-or-search
 bindkey -M viins "^j" down-line-or-search
 
diff --git a/themes/ashleydev.zsh-theme b/themes/ashleydev.zsh-theme
index 68fa48d14..be4710cd2 100644
--- a/themes/ashleydev.zsh-theme
+++ b/themes/ashleydev.zsh-theme
@@ -111,7 +111,7 @@ update__GIT_PROMPT_INFO ()
 
     local _prompt="$b$r$s$i$p"
     # add ( ) around _prompt:
-    if [ $f = 'yes' ]; then
+    if [ "$f" = 'yes' ]; then
         _prompt="($_prompt)"
     elif [ "$u" = "yes" ]; then
         _prompt="$_Cu_dirty_($_prompt$_Cu_dirty_)"