Fixed .travis.yml and Makefile (It has to be done at some point)