Transfered information from http://wiki.mediagoblin.org/Storage into docs/source/devel/storage
For info check out ticket: issues.mediagoblin.org/ticket/660
Updating branch...
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into ticket-660
Check for duplicate collection slugs and make them unique. Add unique constraint to collection.slug model
Removed an unused import
Merge remote-tracking branch 'refs/remotes/rodney757/issue643' into mergetest
Don't turn on sqlite refcheck stuff during migrations
Switch "sqlite_refcheck" keyword arg to "migrations" which Elrond thinks is cleaner

Also, if migrations is true, *explicitly* say that foreign key checking is off
Merge remote-tracking branch 'refs/remotes/npigeon/ticket-660'
word-wrapping the public/queue storage explainations in storage.rst
Fix translations for collections and drop useless try.

Don't do:  _("With some value: %s" % value)
Please do: _("WIth some value: %s") % value

Fixed for collection messages.

Also removed a
  try:
    some_code.
  except Exception as e:
    raise

No point in doing that.

Fixing the indentation of some_code comes in an extra
commit, because changing indentation is annoying enough
alone, so don't mix it with other changes.
Remove extra indentation left over from previous commit.

This only removes an unneeded extra indentation, left over
from the previous removal of code around.

Extra commit so it is easy to check that it only changes
indentation.
Make uuid look like a uuid.

If we really have to create a visible uuid (for a slug in
this case), don't try to hide the fact that it is a uuid.
So format it like a uuid.
image resizing: Refactor some decisions into resize_tool.

Loading the thumb/medium sizes from the config, saving
things to the db, and loading the image is now all done by
resize_tool. It still calls resize_image for the actual
work.
Rewrite resize_image to use proc_state.store_public.

This hopefully makes the code nicer and easier to change.
Create redir_obj and use it around.

This is a shortcut function to redirect to the main page
for an object. Objects currently supported: media entries
and collections.

And go around and replace various places to use this.
Add warning about crypt/itsdangeroussecret.bin.

You should not leak that file, really.
Make all media types use the new MediaManager classes.
Fix media manager reference in video.

An uninstantiated bare media manager doesn't any more
support ["something"]. You need to do .something.
Fixed for .source_type().
Fix typo in new stl MEDIA_MANAGER.