upgrade factorygirl to 2.6.4

also, move factories into their own files
Merge branch 'factory_girl_upgrade' into shared_calendar

Conflicts:
	Gemfile
	Gemfile.lock
	spec/controllers/facility_reservations_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/factories/nufs_accounts.rb
	spec/factories/products.rb
	spec/factories_env.rb
	spec/models/order_detail_spec.rb
	spec/models/reservation_spec.rb
	spec/product_shared_examples.rb
	spec/spec_helper.rb
factories for getting reservations set up nicely