added emacs fixes
Merge branch 'master' of github.com:daniellawrence/dot-files