Merge branch 'master' of https://github.com/fleagle/configure
update emacs config
delete local file
Merge branch 'master' of https://github.com/fleagle/configure