Updates some ecommerce shipping issues, updates upscalculator to use wsdl v16, better 'forced shipping' adhereance/display (if shipping forced don't display other shipping options), shipping choices now use more user friendly names/terms, can now force a shipping method without forcing the option (e.g, UPS, but not the specific option of say Ground)
Merge remote-tracking branch 'origin/master'