Conflicts:
	setup.py

Media repository

Allow only one download for a given image at a time, so that we don't end up downloading the same image twice if two clients request a remote image at the same time

Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server