Added aliases
Env vars
Merge branch 'master' of github.com:gehrhorn/oh-my-zsh