merge tests/Makefile into main Makefile
update travis invocation
fix travis
[tests] fix compiler warnings
Merge pull request #376 from cgzones/merge_test_makefile

Merge test makefile