allow change_user to be set by :symbol to trigger a method or as a Proc
Merge branch 'change_user' into bucket

Conflicts:
	spec/support/models.rb