Initial merge with empty master

Merge branch 'master' of https://github.com/Russell91/emacs
Merge branch 'master' of https://github.com/Russell91/emacs