Merge branch 'master' of github.com:rinx/dotfiles
Remove ftplugin.sh
Merge branch 'master' into mac