Various Improvements (A Continuation of #44)

Taking over from https://github.com/zapier/django-drip/pull/44 and trying to get it to run across all versions of Django.