Merge pull request #1 from adamcandy/master

Bring in updates to Travis config