Just cleaning up.
Merge branch 'master' of https://github.com/timotheosh/dotemacs-work