Adding to .travis.yml and Makefile