Add conditional logic for color ls based on OS
Merge branch 'master' of https://github.com/PeterDP/dot_files

Conflicts:
	bash_profile
Improve git colors for white background