Do not edit processed return items

Working on pulling in the latest returns & exchange stuff from bonobos/spree/2-2-dev.

This contains two distinct but related commits.  See individual commit messages.