Changes to makefiles for travis