Merge branch 'master' into issue/1068/voucher_improvements

Conflicts:
	oscar/apps/dashboard/vouchers/forms.py
Fix migrations and style issues
Update tests for new fields and correct timezone handling

Using timezone.now() will return naive datetimes if USE_TZ is not
enabled, which is what we want.
Resolves errors of comparing naive datetimes with aware datetimes.
Enable timezones for test suite

The tests passed before it, but it seems sensible to test the more
complex scenario.