Rearrange Travis config, use different shapefile for stateprovinces layer in tests