Merge branch 'master' of github.com:tvavrys/django-memoize
Default timeout set to Django's default - 300 seconds