Merge pull request #825 from JeffPyeBrook/sputnik-warnings

Sputnik Warnings
wpsc_disregard_shipping_state_fields was missing a return value in some cases
Merge pull request #827 from JeffPyeBrook/mising-return-value-wpsc_disregard_shipping_state_fields

Missing return value in function
Merge remote-tracking branch 'upstream/master'