Cleanup. Integration of the good parts of emacs starter kit.