Increase test timeout to 40s from 20s, for travis to complete tests
Merge pull request #125 from humphd/travis-timeout

Increase test timeout to 40s from 20s, for travis to complete tests