Dropped test/unit and Mocha for plain rspec everywhere

Some other minor mocking tweaks too, and regenerated Gemfile.lock from linux only, to try and keep the windows mess out of there.