Rename "gff" to "git-jump" and improve a bunch
Improve git prompt w/ detached HEAD
Add gj and gj- git-jump aliases.
Fix minor typo in git-jump.
git-jump should now work better with merges.
Minor comment tweak
git-jump: bypass pre-commit hooks when jumping.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  git-jump: bypass pre-commit hooks when jumping.
  Minor comment tweak
  git-jump should now work better with merges.
  Fix minor typo in git-jump.
  Add gj and gj- git-jump aliases.
  Improve git prompt w/ detached HEAD
  Rename "gff" to "git-jump" and improve a bunch