Don't fail if gnugo or colortheme are not there
Merge branch 'master' of git://github.com/emillon/dotemacs

Conflicts:
	.emacs