Merge remote-tracking branch 'origin/master' into v2

.travis.yml

@@ -14,6 +14,8 @@ matrix:
   allow_failures:
   - go: master
   include:
+  - go: 1.6.2
+    os: osx
   - go: 1.1.2
     install: go get -v .
     before_script: echo skipping gfmxr on $TRAVIS_GO_VERSION

CHANGELOG.md

@@ -34,6 +34,8 @@
 ## [Unreleased] - (1.x series)
 ### Added
 - `./runtests` test runner with coverage tracking by default
+- testing on OS X
+- testing on Windows
 
 ### Fixed
 - Printing of command aliases in help text

README.md

@@ -38,6 +38,12 @@ Make sure your `PATH` includes to the `$GOPATH/bin` directory so your commands c
 export PATH=$PATH:$GOPATH/bin
 ```
 
+### Supported platforms
+
+cli is tested against multiple versions of Go on Linux, and against the latest
+released version of Go on OS X and Windows.  For full details, see
+[`./.travis.yml`](./.travis.yml) and [`./appveyor.yml`](./appveyor.yml).
+
 ### Using the `v2` branch
 
 There is currently a long-lived branch named `v2` that is intended to land as