Merge branch 'release/2.6.0' into develop

.gitignore

@@ -16,3 +16,4 @@ test_app/chains.json
 .idea
 .eslintrc.json
 .embark/
+NOTES

lib/contracts/code_templates/define-web3-simple.js.ejs

@@ -1,3 +1,3 @@
 __mainContext.web3 = undefined;
-web3 = new Web3(new Web3.providers.HttpProvider("<%- url -%>'"));
+web3 = new Web3(new Web3.providers.HttpProvider("<%- url -%>"));
 <%- done  %>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "embark",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Embark is a framework that allows you to easily develop and deploy DApps",
   "scripts": {
     "test": "grunt jshint && mocha test/ --no-timeouts && cd test_app/ && npm install && ../bin/embark test",