updating code for the GeoHelper refactoring
Merge branch 'master' of github.com:axiomalaska/sensor-web-harvester

Conflicts:
	src/main/scala/com/axiomalaska/sos/source/Main.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/HadsStationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/NdbcStationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/NerrsStationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/NoaaWeatherStationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/RawsStationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/SnoTelStationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/SosStationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/StationUpdateTool.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/StationUpdater.scala
	src/main/scala/com/axiomalaska/sos/source/stationupdater/UsgsWaterStationUpdater.scala
	src/test/scala/com/axiomalaska/sos/source/SensorWebHarvesterTest.scala