fixed bug in prompt colors that had a too-permissive pattern match for 'admin'
Merge branch 'master' of github.com:rpdelaney/dotfiles

Conflicts:
	home/.bashrc