Merge pull request #1 from hughes/master

Speeds up non-media requests
Update setup.py
Don't use variations
merge
Merge pull request #2 from hughes/master

Auto refresh if cache is empty
Merge branch 'master' of github.com:c2h5oh/django-mediagenerator

Conflicts:
	setup.py
reverts unnecessary hash skipping