Merge branch 'master' into heroku
Remove debug adding households
Merge branch 'heroku'