Remove annoying zsh plugins

Not as useful as I had hoped

Also placate git and the new merging behavior