made emacs more sublimeish
Merge branch 'master' of https://github.com/endrebak/dotfiles

Made edits at school and home; need to merge