Various zsh changes to play nice at work

* Removed editor override(sometimes "kate -b" will want to override it, but it couldn't before)
* Change vcs_info shell characters to something more portable
* Fixed merge conflict prompt
* Made autocomplete ignore users so it's not going to spam tons of users at work