Explicitly use vim as editor in case plain old vi is installed.
Merge branch 'master' of https://github.com/peplin/dotfiles