Update vim-ft-setup.sh / ruby.vim
Merge branch 'master' into mac