Change setup.zsh from Vundle to NeoBundle
Merge branch 'master' of ssh://github.com/csand/dotfiles