pulling over spec tests
getting updated gemfile
beginning merge of testing harness