Small Gemfile tidy up and switch to using simplecov (so we can install/develop on ruby 1.9+).
Small refactor - put classes in separate files.