finallygit diff --cached add color vars and update everything to use them
Merge branch 'master' of github.com:mjperrone/dot_files

Conflicts:
	.bash_prompt
	README.md