Merge changes from upstream

This PR merges the latest code from [jfryman/puppet-rvm](https://github.com/jfryman/puppet-rvm) into this fork.