Changes from OS X and terminal.
Merge branch 'develop' of github.com:aaronc/emacs.d into develop