Merge branch 'develop'

.travis.yml

@@ -8,8 +8,8 @@ before_install:
   - go get github.com/axw/gocov/gocov
   - go get github.com/mattn/goveralls
   - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
-  - pip install --user codecov
 script:
   - $HOME/gopath/bin/goveralls -service=travis-ci
+  - go test -coverprofile=coverage.txt -covermode=atomic
 after_success:
-  - codecov
+  - bash <(curl -s https://codecov.io/bash)