latest changes to .vimrc
Deleted submodules used by pathogen
Migrated pathogen setup to Vundle
Finished migration, pushing setup scripts to a different .vim file
Merge branch 'vundle'