vimrc: Use Vundle instead of pathogen

Use Vundle instead of pathogen and some minor whitespace cleanup