fixed bugs and added custom requirements
Merge branch 'master' of https://github.com/Keats/django-twoscoops-project