Updating .travis.yml to use make files
Updating travis file
Merge branch 'master' into develop
Merge branch 'develop'
...
Merge branch 'develop'