Limit branches to build on travis to master and develop
Merge branch 'master' into feature/cli