Update vim-ft-setup / overwrite plugins
Merge branch 'master' into mac