Updated neobundle
Resolve conflicts in vimrc
Re-adding vimrc.plugins