resolved some conflicts and misplacements with requirement files
cleaned up more requirements
restore used import that was mistakenly removed
more requirement updates: bump django-extensions, add django-select2
more fixes to dailybread. finally understand what was going on here.
Merge branch 'dev'