Fix up some theming.
Merge branch 'master' of github.com:mizhi/dot-emacs

Conflicts:
	init.el