travis!
bump for travis
Merge pull request #2 from CapillarySoftware/master

update from master