re-organising the travis build matrix