Corrected handling of color alternations when missing parts of PS1
Added file coloration for ls on BSD systems and hints for when I finally figure out how the color+ordering thing works for LSCOLORS and LS_COLORS
Real fix for timestamp colorization when git-completion.bash is missing.
Still working out why color alternations aren't working correctly without .git-completion.bash
Finally fixed issue with colorization!
Changed PS1 to show only the git project name and branch, so there is no loner a delay caused by the git describe.
Merge remote-tracking branch 'joel/master' into joel

Conflicts:
	bashrc