Changes to travis.yml and Makefile