Adding shiftwidth=2 to vimrc
Upgrading pathogen.vim
Moving pathogen until after some other settings get set