Update __init__.py

More work on making mapping_type optional for contrib.django.S
Update __init__.py

fixed mapping_type arg name
Merge branch 'master' into patch-1