Switch to docker build image and some tidy up of the travis.yml.