Travis CI testing.
Merge branch 'master' of https://github.com/quiquep/testci
Travis CI testing.