s => self
Improve description for when working on a branch
Tidy up make describe output
-f option, search path, and documentation.
tests for pickle file search path
Tidy up after tests
Merge branch 'take-from-current-dir-and-grandparents'

* take-from-current-dir-and-grandparents:
  Tidy up after tests
  tests for pickle file search path
  -f option, search path, and documentation.
  Tidy up make describe output
  Improve description for when working on a branch
  s => self
Improved description to old-skool tripartite version number.