use ruby-version instead of rvmrc, update dependencies
merge accidental master commit