Merge pull request #95 from flynn/update-travis

Test on Go 1.6