Adding Trie support.  Found issue with empty 'family' in some entries in
the product.txt.
Added trie logic that should have been added earlier.
Merged some updates from master to develop.
Moved unit tests to the right location so it works with mvn command line.
Added junit to pom for mvn command line unit testing.
Checking in so it can be merged to master.
Updated readme to reflect single solution.