Update settings.py
Enabling Unit Testing within CID
Merge pull request #50 from cbmi/develop

Merge Develop into Integration Test