some refactoring and cleanup of inheritence hierarchy
Merge branch 'master' of https://github.com/bendra/sustainable_hashing_companion_code