Remove zenburn theme and add colors from Monokai theme.
Merge branch 'master' of github.com:murshies/emacs

Conflicts:
	.emacs