Fix sorting to use the order used in the apiary file as well

Requests are sorted by method and the order in which they were defined
in the blueprint.

Rebased version #32