travis-ci.org support
Merge pull request #165 from sjmackenzie/master

travis-ci.org support