Merge pull request #15 from expanse-project/rebase-1.4.4

Rebase 1.4.7

.github/CONTRIBUTING.md

@@ -1,6 +1,15 @@
 If you'd like to contribute to go-expanse please fork, fix, commit and
 
-send a pull request. Commits who do not comply with the coding standards
+
+Before you do a feature request please check and make sure that it isn't possible
+through some other means. The JavaScript enabled console is a powerful feature
+in the right hands. Please check our [Bitchin' tricks](https://github.com/expanse-project/go-expanse/wiki/bitchin-tricks) wiki page for more info
+and help.
+
+## Contributing
+
+If you'd like to contribute to go-expanse please fork, fix, commit and
+send a pull request. Commits which do not comply with the coding standards
 are ignored (use gofmt!). If you send pull requests make absolute sure that you
 commit on the `develop` branch and that you do not merge to master.
 Commits that are directly based on master are simply ignored.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "cmd/mist/assets/ext/expanse.js"]
 	path = cmd/mist/assets/ext/expanse.js
-	url = https://github.com/expanse-org/web3.js
+	url = https://github.com/expanse-project/web3.js

.travis.yml

@@ -1,10 +1,12 @@
 language: go
 go:
   - 1.4.2
+  - 1.5.4
+  - 1.6.2
 install:
   # - go get code.google.com/p/go.tools/cmd/goimports
   # - go get github.com/golang/lint/golint
-  # - go get golang.org/x/tools/cmd/vet 
+  # - go get golang.org/x/tools/cmd/vet
   - go get golang.org/x/tools/cmd/cover
 before_script:
   # - gofmt -l -w .