Changes to zshrc.
Changes to zprofile.
Changes to zpreztorc.
Changes to OS X module.
Merge branch 'master' of github.com:miklophone/prezto

I don't know what will happen when I merge this.