Use vim as default editor
Merge branch 'master' of github.com:celadevra/dotfiles