Updated .gemspec using new dev:gemspec rake task
Resolved conflict, regenerated .gemspec