vim: Use ruby filetype when editing Vagrantfile
shell aliases: Add 'b' for 'bundle exec'
Merge remote-tracking branch 'origin/master' into linux