jim's fixes, addresses issue #14
Merge branch 'master' into Jim
issue #11
Merge branch 'master' into Jim
revert changes to sampletown_realtime.cfg
Merge pull request #18 from OpenWaterAnalytics/Jim