merge pull request "Gemspec reorg" by sodabrew