Add Hamcrest dependency to pom.xml
Rework query API for improved query readability
Cauldron API calls should specify type first where necessary