Init
Merge branch 'master' of github.com:takethathe/emacs-config