USGS-CIDA/pyGDP — pull request #80 by dblodgett-usgs (2014-09-25 21:37:46+00:00)
Title: further fixing merge conflict.

Tests all still pass locally.