Merge branch 'master' of https://github.com/Bklyn/prezto into HEAD

* 'master' of https://github.com/Bklyn/prezto:
  [Fix #347] Move 'users' from tag-order to group-order
  Add an alias to ammend a git commit, including the message
  Update external syntax-highlighting
  Update external completions
  [Fix #348] Clarify how GNU utilities are wrapped
  [Fix #338] Remove vi jk and kj bindings
  Check for the existence of .zcompdump before compiling
  Fix auto completion for SSH hosts when saved with a non-standard port
  [Fix #335] Prevent rbenv from hashing gems at startup
  Fix a typo in git documentation
Merge commit '767ea43' into caleb

* commit '767ea43':
What