Added new aliases to git, path updates for zsh, misc sublime changes
Added test/prod functions
Merge branch 'master' of github.com:joshkehn/.config
Added heroku and some git options