upgrade pathogen
Merge branch 'master' into remote-host