Woo 2.2 updates

git-svn-id: https://plugins.svn.wordpress.org/woocommerce-payment-gateway/trunk@995755 b8457f37-d9ea-0310-8a92-e5e31aec5664