change editor back to vim
Merge branch 'master' of github.com:joshuaconner/dotfiles

* 'master' of github.com:joshuaconner/dotfiles:
  rename Mathias.terminal -> Josh.terminal