Update hirefire-resource gem

Could not find hirefire-resource-0.3.1 in any of the sources
Use a different random order of users each time the list is cut for segmented blasts

[71049446]

Conflicts:
	app/models/user.rb
	spec/models/email_spec.rb
	spec/models/list_spec.rb
Remove old merge conflict debris
Merge branch 'refs/heads/develop-fftf'