Allow code/tests to run under MRI

Pulling against dev-2.0