Fix for ReimbursementTypeValidator

Working on pulling in the latest returns & exchange stuff from bonobos/spree/2-2-dev.

Return items preferred reimbursement type returns an instance, not a class. Comparison in reimbursement type validator was always returning false.
Avoid using {...} for multi-line blocks.