Merge branch 'release/1.0.0'
Merge branch 'release/1.1.0'

some new style
Merge branch 'release/1.1.1'
Merge branch 'release/1.2.0'
Merge branch 'release/1.3.0'
use time with zone so tests pass when run in diff timezone
install ruby-debug in dev, remove heroku gem
app doesn't explode when searching for inactive household
clearer instructions when searched for inactive household
Merge branch 'hotfix/1.3.1'
remove rubydebug gem - breaking heroku deploy
Merge branch 'hotfix/1.3.2'
update rails
Merge branch 'hotfix/1.3.3'
Merge branch 'master' into develop

Conflicts:
	Gemfile
	Gemfile.lock
db utility scripts
use association methods