vim: removed "au FileType php ..."
Merge remote-tracking branch 'origin/master'