Zoom control position now configurable through Settings
Merge branch 'master' of github.com:howieweiner/django-leaflet

Conflicts:
	leaflet/templatetags/leaflet_tags.py