Removed dead wood
Revert "changed default user type to client"

This reverts commit 11a370dfd8622553352797a254afd53a2ce80016, which introduces an error when creating a new user, because it was not bundled with any logic to actually create the 'client' user role.

Additionally, the default role of 'admin' is used to authenticate users to the cms.  The original commit did not make any chances that would have allowed a user of type 'client' to have access to the cms.
fixed merge bug
change builder/initialize/ to import/