vim: Use ruby filetype when editing Vagrantfile
Merge remote-tracking branch 'origin/master' into mac