Refactor 152 integration

See https://github.com/18F/openFEC/pull/169