Feature/flatten model directories

Given that we shouldn't be defining a cluttering abundance of our own models, this solves the configuration issue that app/models/datastreams and spec/models/datastreams directories were causing by flattening them out.  It also eliminates the double-inclusion of rspec-rails in the Gemfile, and now only includes it in the development and test environments.