Fixed problems left over from refactoring
Migrated away from .rvmrc