Fix the travis configuration
Add a Makefile for convenience