Merge branch 'v2-prototype' into feature/combinatorial-testing

* v2-prototype:
  Prettier fix
  Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility
  Fix missed merge conflicts
  Fix additional versions and update yarn.lock
  Add OrderWatcherConfig type to 0x.js docs page
  Export OrderWatcherConfig from 0x.js
  Update all package versions to match latest published to NPM
  Update CHANGELOG's with publishes performed on development branch
  Rebase with latest removing PROXY_ID from transfer
  Split transfer impl and AssetProxyMixin
  change @0xproject/types to ethereum-types
  remove mistaken comment
  workaround for TypeScript trailing comma bug
  Document contract_templates

3 files changed, 35 insertions, 8 deletions

diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json
index 04029576c..e5788b867 100644
--- a/packages/base-contract/CHANGELOG.json
+++ b/packages/base-contract/CHANGELOG.json
@@ -1,5 +1,24 @@
 [
     {
+        "version": "0.3.4",
+        "changes": [
+            {
+                "note":
+                    "Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201"
+            }
+        ],
+        "timestamp": 1529397769
+    },
+    {
+        "timestamp": 1527810075,
+        "version": "0.3.3",
+        "changes": [
+            {
+                "note": "Incorrect publish that was unpublished"
+            }
+        ]
+    },
+    {
         "timestamp": 1527008270,
         "version": "0.3.2",
         "changes": [
diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md
index 90ad066b5..a37a08584 100644
--- a/packages/base-contract/CHANGELOG.md
+++ b/packages/base-contract/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.3.4 - _June 19, 2018_
+
+    * Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201
+
+## v0.3.3 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.3.2 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.3.1 - _May 4, 2018_
+## v0.3.1 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index 595bca3a9..02825bb79 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/base-contract",
-    "version": "0.3.2",
+    "version": "0.3.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "copyfiles": "^1.2.0",
@@ -44,10 +44,10 @@
     },
     "dependencies": {
         "ethereum-types": "^0.0.1",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
-        "ethers": "^3.0.15",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {