Made it work from other directories
Colour thingy
Merge branch 'master' of github.com:oholiab/zshrc

Conflicts:
	setup.sh