Added colours for man pages.
Merge branch 'master' into mac

Conflicts:
	bashrc