minor changes to hydrograph_query.html
Merge remote-tracking branch 'usgs_upstream/master'
added ngvd29 test
Merge remote-tracking branch 'usgs_upstream/master'

Conflicts:
	dj_eden_app/views/data_views.py
	tests/station_data_test.py
implemented improved NGVD29 conversion for matplotlib
added NGVD29 test to reduce likelihood of future errors
removed some cruft om forms.py and ngvd29_test.
Merge remote-tracking branch 'usgs_upstream/master'

Conflicts:
	dj_eden_app/hydrograph.py
ngvd29 axes on dygraphs in progress
NGVD29 axis should be operable for daily/hourly single sites, both on
dygraphs and matplotlib

added Bryan's blurb to the header
Merge pull request #20 from rhayes-cida/master

Gaps filled
ngvd29 axis on dygraphs without series data.
Merge pull request #21 from rhayes-cida/master

NAVD29 axis on static graph
Merge remote-tracking branch 'usgs_upstream/master'

Conflicts:
	dj_eden_app/hydrograph.py
	dj_eden_app/stage_data.py
	dj_eden_app/views/data_views.py
NGVD29 axis on dygraphs. Problems with PIL on Windows.
removed some cruft
Merge pull request #22 from ayan-usgs/master

NGVD29 axis on dygraphs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dj_eden_app/views/data_views.py
Add an order clause to the base selects.