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

Conflicts:
	dotemacs.el
	dotemacs.org