Update .travis.yml and updated makefile