diff --git a/vimrc b/vimrc
index ec423cb..75bcb56 100644
--- a/vimrc
+++ b/vimrc
@@ -228,17 +228,19 @@ command! Qall qall
 " Disable Ex mode
 map Q <Nop>
 
-" Terminal mapping
-map <leader>t :terminal<cr>
-tnoremap <leader>e <C-\><C-n>
-tnoremap <A-h> <C-\><C-n><C-w>h
-tnoremap <A-j> <C-\><C-n><C-w>j
-tnoremap <A-k> <C-\><C-n><C-w>k
-tnoremap <A-l> <C-\><C-n><C-w>l
-nnoremap <A-h> <C-w>h
-nnoremap <A-j> <C-w>j
-nnoremap <A-k> <C-w>k
-nnoremap <A-l> <C-w>l
+if exists(':terminal')
+  " Terminal mapping
+  map <leader>t :terminal<cr>
+  tnoremap <leader>e <C-\><C-n>
+  tnoremap <A-h> <C-\><C-n><C-w>h
+  tnoremap <A-j> <C-\><C-n><C-w>j
+  tnoremap <A-k> <C-\><C-n><C-w>k
+  tnoremap <A-l> <C-\><C-n><C-w>l
+  nnoremap <A-h> <C-w>h
+  nnoremap <A-j> <C-w>j
+  nnoremap <A-k> <C-w>k
+  nnoremap <A-l> <C-w>l
+endif
 
 " Map ctrl-movement keys to window switching
 map <c-k> <c-w><Up>
diff --git a/zsh/aliases b/zsh/aliases
index 88b9c85..44aed10 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -19,7 +19,7 @@ alias cd...='cd ../..'
 alias cd....='cd ../../..'
 alias cd.....='cd ../../../..'
 
-alias aliases='nvim ~/.dotfiles/zsh/aliases'
+alias aliases='vim ~/.dotfiles/zsh/aliases'
 alias al='aliases'
 alias b='bundle'
 alias be='bundle exec'
@@ -37,7 +37,7 @@ alias cpr='cp -r'
 alias cw='compass watch'
 alias dot='cd ~/.'
 alias duh='du -csh'
-alias functions='nvim ~/.dotfiles/zsh/functions'
+alias functions='vim ~/.dotfiles/zsh/functions'
 alias f='fg'
 alias gib='gem install bundler'
 alias history='fc -l 1'
@@ -71,6 +71,7 @@ alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias pi='yaourt -S' # wrapper around Arch Pacman
 alias pr='yaourt -R'
 alias po='pacman -Qdt' # see orphaned packages
+alias pu='yaourt -U'
 alias reguard='killall -9 ruby ; guard'
 alias r='rails'
 alias rr='bundle exec rake release'
@@ -85,16 +86,16 @@ alias rc='rails console'
 alias rs='rails server'
 alias reload='source ~/.zshrc'
 alias s='cd ~/.ssh'
-alias sc='nvim ~/.ssh/config'
+alias sc='vim ~/.ssh/config'
 alias t='tree'
 alias u='cd ..'
-alias v='nvim'
-alias vi='nvim'
-alias vim='nvim'
+alias v='vim'
+alias vi='vim'
+alias vim='vim'
 alias vh='vagrant halt'
 alias vs='vagrant ssh'
 alias vu='vagrant up'
-alias vimrc='nvim ~/.vimrc'
+alias vimrc='vim ~/.vimrc'
 
 # Git
 alias am='git commit --amend'
@@ -212,7 +213,7 @@ alias gwip="git add . && git commit -m \"WIP\""
 
 # Notes
 alias notes='cd ~/.personal-files/documents'
-alias pn='nvim ~/.personal-files/documents/Notes/stack.txt'
+alias pn='vim ~/.personal-files/documents/Notes/stack.txt'
 alias writing='cd ~/.personal-files/brain/writing'
 
 # Projects