Rebased headless_test branch with cbmi/master

Moved headless_tests on top of cbmi/master and updated the travis build file