host-coloured prompts, not folding in vim
hex now red
Merge branch 'master' of https://github.com/blbu/configs

Conflicts:
	.bashrc