Return to original order for conditional.

In implementing prefix arguments, I switched the order of the
conditional questions, but I think the original order is more
logical. This version maintains the same functionality in the original,
more intutive order.
Merge pull request #11 from mwfogleman/cond-order

Return to original order for conditional.