ignore ~/.emacs.d/history
Merge branch 'master' of https://github.com/tellett/emacs.d