Merge pull request #713 from cssquirrel/1.3.0

Setting > Shipping Page Refactor, combined fixed/non-fixed methods into single calls