Added prod settings

Conflicts:

	.gitignore
	cigar_example/requirements.txt
Merge branch 'master' of github.com:marcgibbons/django-rest-swagger

Conflicts:
	.gitignore
	cigar_example/requirements.txt
put debug back on
Updated production settings
Merge branch 'master' into develop
Testing allowed methods function against a ViewSet