Bunch of changes for SG
Merge branch 'master' of github.com:philipcristiano/dotfiles

Conflicts:
	zshrc