Not sure what changes I made
Merge branch 'master' of github.com:miklophone/prezto
Changes to zshrc, zshenv, zprofile etc