WIP
Update devtools and remove rspec hack

A new version of rspec was released that includes the fix that was
cherry-picked before. Yeah.