import recent changes from capistrano-rbenv