only run certain branches in travis
Merge branch 'master' into develop
improve tests