Merge branch 'travis'
Fix a typo in LICENSE.txt