Modified Makefile for travis and to avoid recursion