Merge remote-tracking branch 'origin/woocomm-and-shopp-fixes' into woocomm-and-shopp-fixes

Conflicts:
	vp-wp-checkout.zip
	vp-wp-checkout/assets/js/checkout.js
	vp-wp-checkout/woocommerce-vp-integration.php
Merge branch 'woocomm-and-shopp-fixes' of https://github.com/VirtualPiggyInc/oink_woocommerce into woocomm-and-shopp-fixes

Conflicts:
	vp-wp-checkout.zip
	vp-wp-checkout/assets/js/checkout.js
	vp-wp-checkout/woocommerce-vp-integration.php