Many changes related to changing to Vundle vice Pathogen.
Commented out various config options.