Updated a bunch of stuff in my emacs config, incorporated some changes and improvements made by @ryanwersal.
Merge branch 'master' of github.com:hipplej/hipplej-emacs
Whoops