Fixed login to use normal rvm
Update login script - need to clean up a bit more