Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata

Conflicts:
	mediagoblin/gmg_commands/batchaddmedia.py
	setup.py

diff --cc setup.py
index 15fd913c3c2b4862f327e94a821fe0cbc3361bb8,12739ffd3375485485db6a60a62ab1fd694a9802..0716e45f47e0b075145b476c02730f03f85da6d7
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -70,11 -67,7 +70,12 @@@ try
          'oauthlib==0.5.0',
          'unidecode',
          'jsonschema',
+         'requests',
 +        'ExifRead',
 +
 +        # PLEASE change this when we can; a dependency is forcing us to set this
 +        # specific number and it is breaking setup.py develop
 +        'six==1.5.2'
  
          ## Annoying.  Please remove once we can!  We only indirectly
          ## use pbr, and currently it breaks things, presumably till