Trying new container infrastructure
Merge branch 'travis-ci'