Remove redundant sourcing of .vimrc.bundles*
Fix solarized if statement

endif came before setting all options
Update some formatting