Removing vim
Merge remote-tracking branch 'plyfe-boxen/mavericks3'