Resolve merge conflicts

* Conflicts arose as a result of a bad merge in cc7ccd2f19c97e49f0dd95b501281d267a4b3650
* Props @jpmckinney for catching it
Merge pull request #134 from project-open-data/whooooops

Resolve merge conflicts