update .vimrc
Merge branch 'master' of https://github.com/josuesasilva/vim-with-neobundle
some updates