Initial start of emacs config based on emacs-live
Merge remote-tracking branch 'origin/master'