Merge branch 'development' into addExtraDocs

* development: (29 commits)
  Set Lodash dep to an exact version since newer versions introduced breaking changes
  Update Kovan Ethertoken Address
  Update deployer version since manual re-publish
  Add new entry into CHANGELOG
  Fix bad merge
  Update yarn.lock
  Change title
  Add Blake and Zach to About page
  Re-size Jacob and Tom's images
  Manually publish 0x.js back to a working state
  Publish
  Publish
  Fix 0x.js assets
  Remove assets from connect and _bundles from packages that don't generate the folder
  Publish
  Fix packages that aren't working as expected
  Make new packages default to public on publish
  Add new public packages to top-level README
  Update top-level package.json
  Fix incorrect new versions
  ...

# Conflicts:
#	packages/0x.js/package.json
#	packages/connect/package.json
#	packages/json-schemas/package.json
#	packages/sol-cov/package.json

2 files changed, 17 insertions, 12 deletions

diff --git a/packages/deployer/CHANGELOG.md b/packages/deployer/CHANGELOG.md
index 541e74ae0..7d2a0f5e8 100644
--- a/packages/deployer/CHANGELOG.md
+++ b/packages/deployer/CHANGELOG.md
@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## v0.3.0 - _TBD, 2018_
+## v0.3.1 - _March 18, 2018_
+
+    * Add TS types for `yargs`
+
+## v0.3.0 - _March 18, 2018_
 
     * Add support for Solidity 0.4.20 and 0.4.21
     * Replace `jsonrpcPort` config with `jsonrpcUrl` (#426)
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index 8194fffcd..304edbc9e 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/deployer",
-    "version": "0.2.1",
+    "version": "0.3.3",
     "description": "Smart contract deployer of 0x protocol",
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
@@ -43,26 +43,27 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/deployer/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.12",
-        "@0xproject/tslint-config": "^0.4.10",
+        "@0xproject/monorepo-scripts": "^0.1.14",
+        "@0xproject/tslint-config": "^0.4.12",
         "@types/require-from-string": "^1.2.0",
+        "@types/yargs": "^11.0.0",
         "chai": "^4.0.1",
         "copyfiles": "^1.2.0",
-        "nyc": "^11.0.1",
-        "ethers-typescript-typings": "^0.0.2",
+        "ethers-typescript-typings": "^0.0.4",
         "mocha": "^4.0.1",
+        "nyc": "^11.0.1",
         "shx": "^0.2.2",
         "tslint": "5.8.0",
         "types-bn": "^0.0.1",
         "typedoc": "0xProject/typedoc",
         "typescript": "2.7.1",
-        "web3-typescript-typings": "^0.10.0"
+        "web3-typescript-typings": "^0.10.2"
     },
     "dependencies": {
-        "@0xproject/json-schemas": "^0.7.14",
-        "@0xproject/types": "^0.3.1",
-        "@0xproject/utils": "^0.4.1",
-        "@0xproject/web3-wrapper": "^0.2.1",
+        "@0xproject/json-schemas": "^0.7.17",
+        "@0xproject/types": "^0.4.1",
+        "@0xproject/utils": "^0.4.3",
+        "@0xproject/web3-wrapper": "^0.3.1",
         "ethereumjs-util": "^5.1.1",
         "isomorphic-fetch": "^2.2.1",
         "lodash": "^4.17.4",
@@ -73,6 +74,6 @@
         "yargs": "^10.0.3"
     },
     "publishConfig": {
-      "access": "public"
+        "access": "public"
     }
 }