diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index f4c67c4e..d8859a2a 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -5,7 +5,6 @@ yadr=$HOME/.yadr
 
 # YADR support
 alias yav='yadr vim-add-plugin'
-alias yuv='yadr update-plugins' #FIXME: backwards compatibility. Kill me after Jan 1, 2013
 alias yup='yadr update-plugins'
 alias yip='yadr init-plugins'
 
@@ -15,7 +14,6 @@ alias psg="ps aux | grep "
 alias psr='ps aux | grep ruby'
 
 # Moving around
-alias ..='cd ..'
 alias cdb='cd -'
 
 # Show human friendly numbers and colors
@@ -28,7 +26,7 @@ alias du='du -h -d 2'
 alias lsg='ll | grep'
 
 # Alias Editing
-alias ae='vi $yadr/zsh/aliases.zsh' #alias edit
+alias ae='vim $yadr/zsh/aliases.zsh' #alias edit
 alias ar='source $yadr/zsh/aliases.zsh'  #alias reload
 
 # vim using
@@ -39,10 +37,10 @@ if [ $MACVIM_INSTALLED -eq 0 ]; then
 fi
 
 # vimrc editing
-alias ve='vi ~/.vimrc'
+alias ve='vim ~/.vimrc'
 
 # zsh profile editing
-alias ze='vi ~/.zshrc'
+alias ze='vim ~/.zshrc'
 alias zr='source ~/.zshrc'
 
 # Git Aliases
@@ -54,7 +52,7 @@ alias gsa='git stash apply'
 alias gsh='git show'
 alias gshw='git show'
 alias gshow='git show'
-alias gi='vi .gitignore'
+alias gi='vim .gitignore'
 alias gcm='git ci -m'
 alias gcim='git ci -m'
 alias gci='git ci'