Fix some errors.

endpoints/api/robot.py

@@ -35,10 +35,8 @@ class UserRobot(ApiResource):
     """ Create a new user robot with the specified name. """
     parent = get_authenticated_user()
     robot, password = model.create_robot(robot_shortname, parent)
-    resp = robot_view(robot.username, password)
     log_action('create_robot', parent.username, {'robot': robot_shortname})
-    resp.status_code = 201
+    return robot_view(robot.username, password), 201
-    return resp
 
   @nickname('deleteUserRobot')
   def delete(self, robot_shortname):

endpoints/api/user.py

@@ -226,22 +226,22 @@ class ConvertToOrganization(ApiResource):
       'type': 'object',
       'description': 'Information required to convert a user to an organization.',
       'required': [
-        'username',
+        'adminUser',
-        'password',
+        'adminPassword',
-        'email',
+        'plan',
       ],
       'properties': {
-        'username': {
+        'adminUser': {
           'type': 'string',
-          'description': 'The user\'s username',
+          'description': 'The user who will become an org admin\'s username',
         },
-        'password': {
+        'adminPassword': {
           'type': 'string',
-          'description': 'The user\'s password',
+          'description': 'The user who will become an org admin\'s password',
         },
-        'email': {
+        'plan': {
           'type': 'string',
-          'description': 'The user\'s email address',
+          'description': 'The plan to which the organizatino should be subscribed',
         },
       },
     },