added gem_repo and rubygem_link attributes to jem
fixed merge conflicts