Changed generic_file model to include nu_description
Refactored datastream models/specs to live app/models and spec/models for the moment; nesting them in datastream directories was causing problems.  Removed double-inclusion of rspec-rails in the Gemfile; it is now only included for the :development and :test groups.
Merge pull request #41 from nu-lts/feature/flatten_model_directories

Feature/flatten model directories
changed file name because of hydra collision
Adding collections resouce to routes.rb
Basic rails generation for nu_collections
added new stub to collections controller
Created stub for new collection view
adding create sub to collections controller
Merge branch 'feature/collections' of github.com:nu-lts/drs-sufia-app into feature/collections