Merge pull request #1 from adamcandy/master

Bring in updates to Travis config
Merge pull request #36 from gismeshing/master

Merge pull request #1 from adamcandy/master