no color
Merge branch 'master' of github.com:winchendonsprings/.dotfiles

Conflicts:
	.Xdefaults
if shell