limit travis builds to master and develop branches
Merge branch 'hotfix/travis.yml-update' into develop