Remove unused flags
Split test and coverage; we cant run lcov in Travis CI
Merge branch 'master' into builds
7.154