Tweak .rvmrc
Add ey.yml
Merge conflicts