Merge remote-tracking branch 'nmeans/process-labeling' into wip

Conflicts:
	lib/resque_scheduler/tasks.rb