Simpler and more flexible configuration
Merge branch 'master' of github.com:recamshak/django-cors-headers

Conflicts:
	corsheaders/middleware.py