sjgjohnston: Committing updates to the models, adding test data, adding needed gems, adding rspec infrastructure.
Fix merge conflicts