Some settings tweaks. Update TOOD.
Merge branch 'master' of github.com:sandinmyjoints/.emacs.d