edit neobundle.vimrc
Merge branch 'master' of github.com:hassy-6thsense/dotfiles