Merge pull request #1 from justforfunfuntest/master

Update .travis.yml
Merge pull request #2 from justforfunfuntest/coverity_scan

Merge pull request #1 from justforfunfuntest/master