use vim not emacs
Merge branch 'master' of github.com:fjogstad/dotfiles