clean up roles and users and a join table
Added address model
Merge pull request #16 from jjulien/address_model

Added address model
Updated seeds.rb to use find_or_create_by when creating note types
Merge pull request #17 from jjulien/notes_seeds

Updated seeds.rb to use find_or_create_by when creating note types
Aliased abbreviation to abbv for State model
Annotate models
Merge pull request #18 from jjulien/master

Annotate models
Added model for households
Related household and person models
Added household search/add page.  Existing household search and selection is working.

Still need to add a new household page.
Working on add household code
Added household functionality to create person screen

Added the ability to select an existing household or create a
new household when creating a new person
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
Merge pull request #21 from jjulien/people

Converted address creation to a more standard method
resolving conflict in routes.rb