Resolve merge conflicts

* Conflicts as a result of a bad merge in cc7ccd2f19c97e49f0dd95b501281d267a4b3650
* Props @jpmckinney for catching 'em
* Should be no substantive changes, just resolves a technical issue

Fixes #131.

*See* https://github.com/project-open-data/project-open-data.github.io/pull/57#issuecomment-23229929