Shuffle code around Makefile and .travis.yml