Gave up travis clang build and reversed some changes to the Makefile