Andschwa rbenv

This PR is a rebase against master of #114