Updated Makefile and travis build