travis
Merge pull request #6 from CapillarySoftware/travis

travis