Travis-CI builds now passing

A number of dependencies fixed, and a number of real test failures too.