.gitignore .ruby-version .ruby-gemset
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from JLann/master

Added functionality to person model
Reverting styles
Merge pull request #23 from jjulien/master

Reverting styles
Fixed bugs in redirect after adding a new person

When adding a new person the user would be redirected to the main person search
page which would display the user they just created.  They would not be able
to modify the search field though as it would generate errors from the AJAX
call because the AJAX was coded with a relative search path.  This commit
fixes that problem by absolutely referencing that search URL.  It also
further clarifity to the search results by populating the search field with
a search for the user they just created.
Moved "Select or Create Household" button and fixed style on Create button
Merge pull request #25 from jjulien/people

Fixed bugs in redirect after adding a new person
Changed household name to display the lastname of the head of household rather than the summary of the household.
Merge remote-tracking branch 'upstream/master' into people
Merge pull request #26 from jjulien/people

Changed household name display
Merge remote-tracking branch 'upstream/master'
Remove .coffee files since we aren't currently using them.
Revert bad migration.
Merge pull request #27 from davidleach/master

Remove coffeescript files
Added permission constants to be used when creating roles and enforcing policies
Merge pull request #28 from jjulien/permissions

Added permission constants to be used when creating roles and enforcing policies
Shifting all permission bits one to the left so the first permission is not 0
Merge pull request #29 from jjulien/permissions

Shifting all permission bits one to the left so the first permission is not 0
Undoing previous permission bit modification

1 << 0 == 1, my mistake, I saw the 0 and didn't evaluate it all the way out