Merge remote-tracking branch 'jkuan/git_version' into version_info

Conflicts:
	autojump

autojump

@@ -27,6 +27,7 @@ from tempfile import NamedTemporaryFile
 from operator import itemgetter
 import os
 
+AUTOJUMP_VERSION = "release v17"
 MAX_KEYWEIGHT = 1000
 MAX_STORED_PATHS = 600
 COMPLETION_SEPARATOR = '__'
@@ -210,7 +211,7 @@ def shell_utility():
     """Run this when autojump is called as a shell utility"""
     try:
         optlist, args = getopt.getopt(argv[1:], 'a',
-                ['stat', 'import', 'completion', 'bash']) 
+                ['stat', 'import', 'completion', 'bash', 'version', 'help'])
     except getopt.GetoptError as ex:
         print("Unknown command line argument: %s" % ex, file=stderr)
         exit(1)
@@ -230,6 +231,11 @@ def shell_utility():
             output(unico("%.1f:\t%s") % (count, path))
         print("Total key weight: %d. Number of stored paths: %d" %
                 (sum(path_dict.values()), len(paths)))
+    elif ('--version', '') in optlist:
+        print("autojump %s" % AUTOJUMP_VERSION)
+    elif ('--help', '') in optlist:
+        print("usage: j <dirspec>")
+        print("where dirspec is a few characters of the directory you want to jump to.")
     else:
         import re
         completion = False