Pulling and aggregating water data for last 14 days, switched the graph data around to look for the new fields
Merge branch 'master' into water-graph-jc