django 1.6 change
Merge remote-tracking branch 'origin/master' into dimagi-improve
code indentation and formatting