Misc updates
Add git color
Minor updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc
	zshrc