Travis config and Makefile updates