Git config file for m2-at-snap2web.com
Modify PS1 prompt to also show current time
Modify PS1 prompt.  More readable code + dir as "3..2" format
Unbold the yellow used for the branch name.
Merge branch 'master' of github.com:durrantm/setups-and-dotfiles

Conflicts:
	.bashrc