Updated for travis
Merge branch 'hotfix/travis-boothstrap'