Sync from justin2
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	zshrc
Pretty right status bar