env friendly stuff
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	zshrc