Cleanup and many changes inspired by magnars [1]

[1] https://github.com/magnars/.emacs.d