More shuffling of travis testdeps