Merge branch 'master' of github.com:overtone/emacs-live
merge
Merge branch 'master' of github.com:martinffx/emacs-live
merge with master