Johnd develop

Merged initial version of deployer-client