Merge pull request #1 from ambitioninc/master

syncing with fork
Update conf.py
Merge pull request #8 from wesleykendall/master

Added django configuration to Sphinx