Look and feel update
Merge branch 'org' of github.com:fizban007/emacs.d into org

Conflicts:
	emacs.org