Merge branch 'salesforce' of https://github.com/calblueprint/PHC

* 'salesforce' of https://github.com/calblueprint/PHC:
  fix merge conflicts
Merge branch 'master' of https://github.com/calblueprint/PHC

* 'master' of https://github.com/calblueprint/PHC:
Merge branch 'master' of https://github.com/calblueprint/PHC

* 'master' of https://github.com/calblueprint/PHC:
  Clarify application purpose
  Clean routes.rb
  Delete database.yml
  Update gemfile, add database.yml to .gitignore
  Update gitignore
  Generate rails application
Initialize one participant account
Create better test data
Merge pull request #24 from calblueprint/howard/testScript

Howard/test script