Rspec 3

Convert test suite into rspec 3 compatible syntax.

All tests pass, but there are still some deprecation notices. I want to remove them before we merge this in, but wanted to publish it now, so we can run the tests on travis.