Revert "Merge pull request #25 from codeforamerica/merge-upstream"

This reverts commit 69d400b1602ab847289e0cecd3c03a1a4c0eb3db, reversing
changes made to 0460dc7bb00451c927d9355ab76b8f3a56e4ca46.