cleaning up instruments
upgrade factorygirl to 4.1

also, move factories into their own files

Conflicts:
	spec/controllers/facility_reservations_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/models/order_detail_spec.rb
	spec/models/reservation_spec.rb
	spec/product_shared_examples.rb
Merge branch 'factory_girl' into shared_calendar

Conflicts:
	spec/controllers/facility_reservations_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/models/order_detail_spec.rb
	spec/models/reservation_spec.rb
	spec/product_shared_examples.rb