more fixes
Add rvmrc
Revert snafu
Bug fixes