80 column rule
Merge branch 'qmhe' of https://github.com/QingmingHe/emacs.d into qmhe

Conflicts:
	qmhe.el