Modified to include macvim
Merge branch 'master' of https://github.com/tmcinerney/our-boxen