Clean up, django shit
Merge stuff