Setting ls color options depending on whether we're using GNU or BSD ls
Merge branch 'master' of github.com:chapmajs/dotfiles

Conflicts:
	bashrc