shipping provider settings page fixes
Merge pull request #596 from protherj/test-110

Test 110
Shipping Fixes: Deletion of Methods, other fixes
Merge pull request #598 from protherj/ups-provider-fixes

Ups provider fixes
Merge branch '1.1.0' of https://github.com/rustyswayne/Merchello into 1.1.0