Clean up the Travis build a bit