Amendment to previous commit to make Travis CI work again and to distinguish local makefile use from the one on Travis.