Fix gemrc problem (yaml parsing errors occured in odd places), some minor cleanup