move away from non typesafe hamcrest matchers to the custom version. Move a number of matchers to to the lang module. Cleanup a bunch of cruft.