grabbed upstream with new migrations
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