Consolidate Django and test requirements
Merge pull request #2173 from jpadilla/master

Consolidate Django and test requirements