travis
Merge pull request #5 from lukemetz/travis

travis