Updating gemfile to remove conflict issues
Serialize the changes instead of storing as json
Version bump to 2.2.0
Regenerate gemspec for version 2.2.0