More robust integration test and minor refactoring
Introduce wordnik.Client, replacement for defme/configuration