Turns out launching zsh in bashrc is a bad idea
Merge branch 'master' of github.com:jdavis/dotfiles