Short-term fix to make the Travis builds work on master

(The long term fix will involve some work on the buildout and version configs I expect.  But that's beyond my current level of Python skills.)