Merge branch 'master' of github.com:steveshogren/Dot-Emacs

* 'master' of github.com:steveshogren/Dot-Emacs:
  Making the overridden colors a little cooler
  Making some configs conditional for my laptop