bumping version of Django in setup.py to correspond to requirements/base.txt
adding myself to contributors
Merge pull request #153 from arruda/fix-setup-django-version

Fixing setup.py django version
Merge remote-tracking branch 'upstream/master'