Upgrade pathogen
Merge branch 'master' of github.com:rupa/.vim