TravisCI fixes #6 - hopefully final