improved makefile for CI
various additions to handle travis