Fixed vimrc to work with latest neobundle
Merged with upstream