Updated travis config so that only the master branch and pull requests for the master branch are used
Merge remote-tracking branch 'upstream/master'