Merge pull request #252 from mhhf/master

Small fixes

README.md

@@ -113,6 +113,17 @@ emits the following:
 adds `Contract` objects instantiated from `web3.js` for each object in
 the `dappfile`
 
+#### FAQ
+##### Can I use TestRPC with dapple?
+If you are using TestRPC, remember that `dapple run` has a default block
+confirmation time of one block. To prevent a deadlock you need to turn off the
+confirmation time testrpc environment:
+```
+environments:
+    test:
+        confirmationBlocks: 0
+```
+
 #### Example packages
 
 * [Dappsys](https://github.com/nexusdev/dappsys) — a contract system framework (Nexus's "standard library")

package.json

@@ -48,8 +48,8 @@
     "deasync": "^0.1.4",
     "dir-compare": "0.0.2",
     "docopt": "^0.6.2",
-    "ethersim": "git+https://github.com/nexusdev/EtherSim.git",
     "ethereumjs-lib": "^3.0.0",
+    "ethersim": "git+https://github.com/nexusdev/EtherSim.git",
     "file": "^0.2.2",
     "fs-extra": "^0.26.3",
     "fs-readdir-recursive": "^1.0.0",
@@ -72,13 +72,14 @@
     "multimatch": "^2.1.0",
     "read-yaml": "^1.0.0",
     "semver": "^5.1.0",
+    "shelljs": "^0.6.0",
     "solc": "^0.3.1-1",
-	"shelljs": "^0.6.0",
     "stream-combiner": "^0.2.2",
     "through2": "^2.0.0",
     "tmp": "0.0.28",
     "tv4": "^1.2.7",
     "user-home": "^2.0.0",
+    "vinyl": "^1.1.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-fs": "^2.2.1",
     "web3": "^0.15.1",