make sure we load the promotion rules after initialize so the user rules are correctly saved. also remove the after_save on promotion, this is no longer needed.

Conflicts:
	core/app/models/spree/promotion.rb