version bump in gemspec
setting a content type by default
merging conflicts