From 071dc5076987819fcc84f3b7fadeec09b6c40837 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmyzelinskie@gmail.com>
Date: Wed, 19 Aug 2015 13:49:03 -0400
Subject: [PATCH] travis: update to Go 1.5

---
 .travis.yml | 7 +++++--
 README.md   | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d8b3f05..732c93c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 language: go
 
-go: 1.4
+go:
+  - 1.4
+  - 1.5
+  - tip
 
 sudo: false
 
@@ -9,7 +12,7 @@ before_install:
   - godep restore
 
 script:
-  - godep go test ./...
+  - go test -v ./...
 
 notifications:
   irc:
diff --git a/README.md b/README.md
index 5913135..8a00476 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ use-cases).
 
 ## Building & Installing
 
-Chihaya requires 64-bit Go 1.4, [Godep], and a [Go environment] previously set up.
+Chihaya requires Go 1.4+ (preferrably the latest stable Go), [Godep], and a [Go environment] previously set up.
 
 [Godep]: https://github.com/tools/godep
 [Go environment]: https://golang.org/doc/code.html
@@ -47,7 +47,7 @@ $ export GOPATH=$PWD/chihaya
 $ git clone https://github.com/chihaya/chihaya.git chihaya/src/github.com/chihaya/chihaya
 $ cd chihaya/src/github.com/chihaya/chihaya/cmd/chihaya/
 $ godep restore
-$ godep go install github.com/chihaya/chihaya/cmd/chihaya
+$ go install github.com/chihaya/chihaya/cmd/chihaya
 ```
 
 ### Testing