mt emacs dir
Merge branch 'master' of github.com:ctrl-shift/emacs.d

Conflicts:
	README.md