More stuff
Merge branch 'master' of https://github.com/yifu/emacs.d

Conflicts:
	init.el
	my-packages.list