fix emacs and vim settings
Merge branch 'master' into my-mba