Merge pull request #383 from vjoel/master

Add LICENSE.txt to gem.files in gemspec
Merge remote-tracking branch 'upstream/master'