Update Makefile for Travis Builds