Updated setup and rvm config
Tweaked a few things