Revert "Fix incorrect shipment calculation"

This reverts commit 785161c3

As per comment:
https://github.com/spree/spree/issues/1606#issuecomment-11440193 and
issue #2328.
Updated paperclip rake command with proper class info for spree.

Fixes #2369