add/merge twoscoops django project
Add/merge configurations
Cleaning up