fixing some rbenv stuff
fix merge conflicts
changed bash_profile to bashrc
update comments
Merge pull request #22 from where/fix_rbenv_update_and_versions

fixing some rbenv stuff