enable and define colors
Merge branch 'master' of https://github.com/skoef/dotfiles

Conflicts:
	bash/dot.bash_profile