Merge branch 'master' of github.com:dschwilk/emacs-config

Set up tracking with github.  Should be no changes to master.
Merge branch 'master' of github.com:dschwilk/emacs-config