rspec 3 cleanup -- converted cucumber steps
Merge branch 'master' into threading_restructure
Merge branch 'threading_restructure' into threading_and_sandstorm