Feature/optimise travis

Following discussion with @tombooth - a few changes to hopefully speed up the spotlight build a little.