Cleaned up Makefile
Cleaned up Makefile
Added make check to travis yml