post merge cleanup of #749

[mr-c]

No description provided.

[mr-c]

#749 (comment) still needs addressing

[ctb]

whistles nonchalantly nothing to see here. Ready for review.

[mr-c]

Testing FTW :-)

• Is it mergable?
• Did it pass the tests?
• If it introduces new functionality in scripts/ is it tested?
  Check for code coverage with make clean diff-cover
• Is it well formatted? Look at make pep8, make diff_pylint_report,
  make cppcheck, and make doc output. Use make format and manual
  fixing as needed.
• Did it change the command-line interface? Only additions are allowed
  without a major version increment. Changing file formats also requires a
  major version number increment.
• Is it documented in the ChangeLog?
  http://en.wikipedia.org/wiki/Changelog#Format
• Was a spellchecker run on the source code and documentation after
  changes were made?

[ctb]

hang on a bit, fixing something else.

[ctb]

test this please

[ctb]

Ready for review.

[ctb]

Actually, now I'm confused. You made some changes, I made some changes... who should review? :)

[mr-c]

:-) This PR is all you. LGTM; merging

[ctb]

Excellent. (I knew I could slide stuff by you by changing hash to counting and hashbits to presence :)

[mr-c]

You know me well!