Merge pull request #2388 from reaperhulk/docs-testing

Doc update for test matrix + OS X install