remove phpfolding since it has script error with new version vim
Merge branch 'master' into ubuntu