Refactors referral controller, adds affiliated user spec, adds affiliate action for referral controller spec, updates rspec to 2.3, adds affiliate_record to User
Adds affiliated promotion rule spec
Adds affiliate model spec
Merge branch 'master' into doorbot

Conflicts:
	app/models/spree/user_decorator.rb