Switched to Vundle and little .vimrc updates