Use the proposed upstream changes to `feature`

We've opened [a PR against the upstream project](https://github.com/mgsnova/feature/pull/22) to support our use-case so use that.

@benlovell @tomas-stefano @dougdroper