correctly show variant options

Fixes #2466
Reset preferences after spec to properly teardown test and avoid files being saved where they are not gitignored.

Fixes #2467
Use pluck instead of mapping attributes for performance.

Fixes #2468
An order should be able to ship when awaiting return and in the returned state

Fixes #2444
Merge git://github.com/spree/spree