license
Merge pull request #15 from grosser/grosser/license

license
use travis for testing, fix tests