Some customizations
Merge branch 'master' of github.com:shentonfreude/dot-emacs