setup py fails

Cannot import django_settings in setup.py, because it will escalate impporting django at install time
this escalation breaks automated virtualenv creation from requirement files
import django_settings
Merge commit 'a4d1f50a1e190f2b25125f7eda97e31a09983460'
Merge branch 'master' of github.com:Troyhy/django-settings

Conflicts:
	setup.py