Cleanup merge comments. Why were these still here?
Django commands to simplify case and fixture related actions: Early version.
Merge branch Nandini's 'dimagi-improve' with Chandu's dimagi-improve.