Cleanup of .emacs

Cleaned up .emacs and put comments/sections around the functionality
.emacs update

Cleaned up .emacs
Merge branch 'master' of https://github.com/malteof/emacs