Allow feature files to be merged regardless of order

Resolves #149.  Maybe.  Since this is based off the unit test branch by @desilinguist, which might not work, this might not work yet.