pull bld/travis

This enables a matrix build, with twsapi once taken from the git repo (current behaviour) and once off the ppa.