Use modern import for django.conf.urls
POSITION_CHOICES not mandatory since 3e391fd0
Merge pull request #397 from DrMeers/master

Doc tweak
Merge branch 'master' into next
Merge branch 'next' into tabbed_options