Merge branch 'development' into fix/docLinks

* development:
  Update and standardize contracts README
  Add to CHANGELOG
  Refactor toBaseUnitAmount so that it throws if user supplies unitAmount with too many decimals
  Make assertion stricter so that one cannot submit invalid baseUnit amounts to `toUnitAmount`
  Add some missed underscores, update changelog and comments
  Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors

# Conflicts:
#	packages/website/ts/pages/documentation/documentation.tsx
#	packages/website/ts/pages/shared/nested_sidebar_menu.tsx

2 files changed, 25 insertions, 25 deletions

diff --git a/packages/dev-utils/src/blockchain_lifecycle.ts b/packages/dev-utils/src/blockchain_lifecycle.ts
index 0e493eb48..aaa5f0f4a 100644
--- a/packages/dev-utils/src/blockchain_lifecycle.ts
+++ b/packages/dev-utils/src/blockchain_lifecycle.ts
@@ -1,21 +1,21 @@
 import {RPC} from './rpc';
 
 export class BlockchainLifecycle {
-    private rpc: RPC;
-    private snapshotIdsStack: number[];
+    private _rpc: RPC;
+    private _snapshotIdsStack: number[];
     constructor(url: string) {
-        this.rpc = new RPC(url);
-        this.snapshotIdsStack = [];
+        this._rpc = new RPC(url);
+        this._snapshotIdsStack = [];
     }
     // TODO: In order to run these tests on an actual node, we should check if we are running against
     // TestRPC, if so, use snapshots, otherwise re-deploy contracts before every test
     public async startAsync(): Promise<void> {
-        const snapshotId = await this.rpc.takeSnapshotAsync();
-        this.snapshotIdsStack.push(snapshotId);
+        const snapshotId = await this._rpc.takeSnapshotAsync();
+        this._snapshotIdsStack.push(snapshotId);
     }
     public async revertAsync(): Promise<void> {
-        const snapshotId = this.snapshotIdsStack.pop() as number;
-        const didRevert = await this.rpc.revertSnapshotAsync(snapshotId);
+        const snapshotId = this._snapshotIdsStack.pop() as number;
+        const didRevert = await this._rpc.revertSnapshotAsync(snapshotId);
         if (!didRevert) {
             throw new Error(`Snapshot with id #${snapshotId} failed to revert`);
         }
diff --git a/packages/dev-utils/src/rpc.ts b/packages/dev-utils/src/rpc.ts
index 19834dbb4..cf6678f81 100644
--- a/packages/dev-utils/src/rpc.ts
+++ b/packages/dev-utils/src/rpc.ts
@@ -2,52 +2,52 @@ import * as ethUtil from 'ethereumjs-util';
 import * as request from 'request-promise-native';
 
 export class RPC {
-    private url: string;
-    private id: number;
+    private _url: string;
+    private _id: number;
     constructor(url: string) {
-        this.url = url;
-        this.id = 0;
+        this._url = url;
+        this._id = 0;
     }
     public async takeSnapshotAsync(): Promise<number> {
         const method = 'evm_snapshot';
         const params: any[] = [];
-        const payload = this.toPayload(method, params);
-        const snapshotIdHex = await this.sendAsync(payload);
+        const payload = this._toPayload(method, params);
+        const snapshotIdHex = await this._sendAsync(payload);
         const snapshotId = ethUtil.bufferToInt(ethUtil.toBuffer(snapshotIdHex));
         return snapshotId;
     }
     public async revertSnapshotAsync(snapshotId: number): Promise<boolean> {
         const method = 'evm_revert';
         const params = [snapshotId];
-        const payload = this.toPayload(method, params);
-        const didRevert = await this.sendAsync(payload);
+        const payload = this._toPayload(method, params);
+        const didRevert = await this._sendAsync(payload);
         return didRevert;
     }
     public async increaseTimeAsync(time: number) {
         const method = 'evm_increaseTime';
         const params = [time];
-        const payload = this.toPayload(method, params);
-        return this.sendAsync(payload);
+        const payload = this._toPayload(method, params);
+        return this._sendAsync(payload);
     }
     public async mineBlockAsync(): Promise<void> {
         const method = 'evm_mine';
         const params: any[] = [];
-        const payload = this.toPayload(method, params);
-        await this.sendAsync(payload);
+        const payload = this._toPayload(method, params);
+        await this._sendAsync(payload);
     }
-    private toPayload(method: string, params: any[] = []): string {
+    private _toPayload(method: string, params: any[] = []): string {
         const payload = JSON.stringify({
-            id: this.id,
+            id: this._id,
             method,
             params,
         });
-        this.id += 1;
+        this._url += 1;
         return payload;
     }
-    private async sendAsync(payload: string): Promise<any> {
+    private async _sendAsync(payload: string): Promise<any> {
         const opts = {
             method: 'POST',
-            uri: this.url,
+            uri: this._url,
             body: payload,
             headers: {
                 'content-type': 'application/json',