Tidy up the gems and gemspec