grabbed upstream with new migrations
Merge pull request #35 from cjwillia/master

Quality Control and Initial Testing
grabbed upstream with initial testing
migrated db again with initial test upstream
added foreign keys to contact and took them from indiv org and prog
changed contact relationships
added validations to contact model
Merge pull request #36 from jschiang/master

fixed contact fks and relationships
started some organization testing
Merge branch 'master' of https://github.com/sankalpk/gelfand
added tests, changed some migrations and model stuff accordingly