Aliases conflict with scm_breeze
Tweaked environment
Use git from PATH, not /usr/bin
Don't use hardcoded user name
Merge branch 'master' of https://github.com/patrikn/dotfiles

Conflicts:
	system/env.zsh
	zsh/zshrc.symlink