basic models
Merge branch 'django-based' of github.com:harvard-lil/roundup into django-based