clean up roles and users and a join table
Merge pull request #18 from jjulien/master

Annotate models
Merge pull request #19 from jjulien/people

Added household functionality when creating new people
make some of the nav active
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb
Merge pull request #20 from electricpineapple/master

Roles UserRoles
Converted address creation to a more standard method