Adds certifi for an updated CA bundle for requests
Merge branch 'python-package' into django-1.6
Merge branch 'django-1.6' into deploy

Conflicts:
	setup.py