Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit d2490719e25e85220f205727852d349a27aa1e61, reversing
changes made to 4d091b6fee652df56a40d0fc9bfe020d03c1cd2d.
add gemrc