First pass at optional shipping. See #86
Merge branch 'master' into feature-oshipping
Merge pull request #87 from AppThemer/feature-oshipping

Optional Shipping. Needs testing.