Fix issues with travis builds failing on master branch.
Merge branch 'dakota-fix-travis'