Upgrading to 3.1 - Still needs work

git-svn-id: https://silverstripe-ecommerce.googlecode.com/svn/modules/ecommerce_delivery/trunk@4622 950b781c-c544-efab-2f99-90083ee69683