lots of changes here to move away from oh-my-zsh and prezto