Remore some merge trash, and add rvmrc for AppFog