Develop

* Fixes re-provisioning issues
* Includes `generator-watson`