Don't auto-indent on newline
Merge branch 'master' of github.com:timwraight/emacs.d
Allow switching in and out of vimp-mode
Require pretty-mode