User, Org updates to support Cucumber acceptance testing

Extended support for various org & user API calls.  Added some error messages and nil reference checks.
The bang `merge!` isn't necessary here. `merge` will do.