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

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