More helpful exception
Fix broken equals method; unit tests pass again
Merge branch 'master' of https://github.com/manimales/wiremock