fix travis-ci link and dependencies graph
remerged changes from master to makefile
fix for unit test build - CPPFLAGS is set before line 154