updating django
Merge pull request #25 from stickwithjosh/upgrading_django

updating django