David's suggestion for better HashMap search, tests written, passing
Merge branch 'Constants' into TuplePimper