revert back to factory_girl_rails, fix bunch o stuff
Merge branch 'fix-broke-shit' of https://github.com/afred/openvault into fix-broke-shit

Conflicts:
	Gemfile.lock
	spec/controllers/custom_collections_controller_spec.rb
	spec/models/carousel_item_spec.rb