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/api/file_storage/__init__.py

@@ -222,7 +222,7 @@ def process_file(gcs, file_id, local_file):
     mime_category, src_file['format'] = src_file['content_type'].split('/', 1)
 
     # Prevent video handling for non-admins.
-    if not user_has_role(u'admin') and mime_category == 'video':
+    if not user_has_role('admin') and mime_category == 'video':
         if src_file['format'].startswith('x-'):
             xified = src_file['format']
         else: