travis
Merge pull request #45 from jonathanong/travis

travis stuff