Merge branch 'master' of https://github.com/apcera/gnatsd

Conflicts:
	TODO.md

.travis.yml

@@ -1,12 +1,13 @@
 language: go
 go:
 - 1.3
+- 1.4
 install:
 - DST=~/gopath/src/github.com/apcera
 - mkdir -p "$DST"
 - git clone --depth=1 --quiet https://github.com/apcera/nats.git "$DST"/nats
-- go get code.google.com/p/go.tools/cmd/vet
-- go get code.google.com/p/go.tools/cmd/cover
+- go get golang.org/x/tools/cmd/vet
+- go get golang.org/x/tools/cmd/cover
 - go get github.com/mattn/goveralls
 script:
 - go build

TODO.md

@@ -19,3 +19,4 @@
 - [ ] Add ENV support to dconf
 - [ ] Modify cluster support for single message across routes between pub/sub and d-queue
 - [ ] Client support for language and version
+- [ ] Place version in varz?