removed php plugin that was borking my indenting
Merge branch 'master' into ycm