Continued to revise the centralized modes settings.
Merge branch 'master' of https://github.com/jpace/emacs