vim filetype plugin install script
Merge branch 'master' into mac