Update makefile
Adapt travis config to be more similar to tox