Derp
Merge branch 'master' of github.com:rykugur/prezto