Hopes to fix a build issue in a dependent project.
fixes some chicken-and-egg client and domain issues.
Merge pull request #14 from derrh/master

Chicken and Egg problems with domain and client