Updated travis.yaml, cleaned up makefile for test syntax