Merge branch 'master' into Heather

Conflicts:
app/views/households/show.html.erb
Greenery