Lots of tidying up around timestamps
Merge branch 'master' of https://github.com/BetterWithDataSociety/ShefAirQualityAgent