Fixes to get tests passing on Travis

Really just changes to the Makefile and to the Travis config