Shuffle a few things around, remove 0.4 testing from travis, adding 0.10