tinkering with Travis
Merge branch 'bob'