Updated Sphinx settings to work with Django 1.7
Merge branch 'sphinx_django_1_7'
Merge branch 'master' into dev