I'm not using zsh
Merge branch 'master' of git://github.com/ayang/vimified