Cleanup and django 1.7 support