commit
Merge remote-tracking branch 'usgs_upstream/master'

Conflicts:
	dj_eden_app/hydrograph.py
Merge pull request #43 from ayan-usgs/master

merged code, slight change to eden_url fix