Updating with my standard .emacs.d content
Merge branch 'master' of github.com:btweinstein/.emacs.d