Trying out new color theme.
Merge branch 'master' of github.com:pat-thomas/emacs

Conflicts:
	init.el