Ran 2to3 on pillar + some manual fixups

The 'manual fixups' are:

- incorrect use of dict.items() where dict.iteritems() was meant; this
  results in list(dict.items()), which I changed to dict.items().
- removal of 'from __future__ import' lines, which 2to3 changes into
  empty lines; I removed the empty lines.

pillar/auth/__init__.py

@@ -55,11 +55,11 @@ def _load_user(token):
 
     login_user = UserClass(token)
     login_user.email = db_user['email']
-    login_user.objectid = unicode(db_user['_id'])
+    login_user.objectid = str(db_user['_id'])
     login_user.username = db_user['username']
     login_user.gravatar = utils.gravatar(db_user['email'])
     login_user.roles = db_user.get('roles', [])
-    login_user.groups = [unicode(g) for g in db_user['groups'] or ()]
+    login_user.groups = [str(g) for g in db_user['groups'] or ()]
     login_user.full_name = db_user.get('full_name', '')
 
     return login_user