Copied over latest changes from affiliated package template

This includes a revamped .travis.yml file