Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev

Conflicts:
	telemeta/locale
	telemeta/management/commands/telemeta-import-collections-from-crem.py

diff --cc telemeta/management/commands/telemeta-import-collections-from-crem.py
index cfec15b59175e28e78d95ff952174164cdabd4d5,ebd712387ec4affc0b27d3d589fef8ca8c9b5764..d286f9737bec7a2879985563bc8b2877734570ca
--- 1/telemeta/management/commands/telemeta-import-collections-from-crem.py
--- 2/telemeta/management/commands/telemeta-import-collections-from-crem.py
+++ b/telemeta/management/commands/telemeta-import-collections-from-crem.py
@@@ -94,10 -92,11 +93,10 @@@ class Command(BaseCommand)
                      f.close()
                  else:
                      print "file in MEDIA_ROOT, linking..."
-                     path = media[len(self.media_root):]
+                     path = media.replace(self.media_root, '')
                      if not self.dry_run:
                          item.file = path
 -                        item.save()
 +                item.save()
                  if self.user:
                      item.set_revision(self.user)
              else: