Improve Makefile

This should fix the Travis build