Fix JSON parser to not parse JSON if its already JSON.
Logic improvements to datasource checking.
Updates to fitbit CSV example. Now we're showing a mashup!