Fix pathogen.vim
Merge branch 'master' into laptop