rebase ontop of recent changes from master

- changes 'engine_request' to 'drone_request'

base.py

@@ -58,10 +58,7 @@ class RequestHandler(webapp2.RequestHandler):
                 self.drone_request = True
         self.public_request = not bool(self.uid)
         log.debug('public request: %s' % str(self.public_request))
-        if engine_request:
-            self.superuser_request = True
-            self.public_request = False
-        elif self.public_request or self.source_site:
+        if self.public_request or self.source_site:
             self.superuser_request = False
         else:
             user = self.app.db.users.find_one({'_id': self.uid}, ['root', 'wheel'])

bootstrap.py

@@ -83,8 +83,8 @@ def dbinit(args):
             db.users.insert(input_data['users'])
         if 'groups' in input_data:
             db.groups.insert(input_data['groups'])
-        if 'engines' in input_data:
-            db.engines.insert(input_data['engines'])
+        if 'drones' in input_data:
+            db.engines.insert(input_data['drones'])
         for u in db.users.find():
             db.users.update({'_id': u['_id']}, {'$set': {'email_hash': hashlib.md5(u['email']).hexdigest()}})