Config updates from client
Merge branch 'master' of github.com:azavea/TNC-LA-Freshwater

Conflicts:
	plugins/feature_compare/compare_config.json