Merge branch 'rspec' into 'master'

spec/acceptance/activities_spec.rb

spec/acceptance/bookmarks_spec.rb

spec/acceptance/collections_spec.rb

spec/acceptance/complaints_spec.rb

spec/acceptance/contacts_spec.rb

spec/acceptance/educational_stages_spec.rb

spec/acceptance/follows_spec.rb

spec/acceptance/institutions_spec.rb

spec/acceptance/languages_spec.rb

spec/acceptance/learning_objects_spec.rb

spec/acceptance/mime_types_spec.rb

spec/acceptance/object_types_spec.rb

spec/acceptance/reviews_spec.rb

spec/acceptance/searches_spec.rb

spec/acceptance/statistics_spec.rb

spec/acceptance/subjects_spec.rb

spec/acceptance/suggestions_spec.rb

spec/acceptance/tags_spec.rb

spec/acceptance/users_spec.rb

spec/factories/download.rb