Simplify Makefile to fix travis build

Travis will now report build errors / test on this branch.