Changes to get Travis (https://travis-ci.org/rjpower/spartan) working.