proper gem file
Merge branch 'gemspec'