more cleanup
yet more cleanup... because I have no idea what I'm doing
Merge branch 'master' of https://github.com/emergentSushi/ze-best-zsh-config