Add survey fields to water fountain model

added factory girl to help with testing
format params to be more readable
change flow naming conventions
API returns survey fields
including factories - woops, should have included this a few commits back
update specs to survey api
Merge pull request #21 from wetap/feature/fountain_survey

Feature/fountain survey