User, Org updates to support Cucumber acceptance testing

Extended support for various org & user API calls.  Added some error messages and nil reference checks.
    def self.find_by_id(id, attrs = {})
      find_active_by_id(id, attrs) || find_inactive_by_id(id, attrs)
    end