Stuff
Merge branch 'master' of github.com:damienzhang/dotfiles

Conflicts:
	zshrc
MacVim actually uses gui_macvim
use macvim as EDITOR