README changes
Merge branch 'master' of github.com:exu/emacs.d

Conflicts:
	README.org