adding gemrc and rebundle.
Fixing merge.