Fix bug that caused circular templates to be uploaded multiple times

Closes #480 (closed). See this comment for a more detailed explanation, but the punchline is that I don't entirely understand why this patch is necessary but it's related to a quirk in celery that has generated a few stackoverflow questions and I've confirmed on emfollow-test that this fix works.