Merge remote-tracking branch 'upstream/master'
derp
Merge branch 'master' of https://github.com/weareconvo/emacs.d