Modified Makefile and improved paths
modified travis