Backporting signal handling while "sleeping" from #352
Merge pull request #353 from meatballhat/backport-handle-signals-in-sleep-loop

Backporting signal handling while "sleeping" from #352
Preparing for 2.5.3 release
Merge pull request #354 from meatballhat/v2.5.3-prep

Preparing for 2.5.3 release
Adjusting some documentation around rake task, cli, env vars

[ci skip]
Merge pull request #355 from meatballhat/documentation-cleanup

Adjusting some documentation around rake task, cli, env vars
Ensuring lock #timeout= behavior is consistent based on locked state

Closes #299
Bumping to v2.5.4 as we've hit the milestone
TRIVIAL: updating commented-out every example

Closes #186
TRIVIAL: un-derping my derp about every

Closes #186 for realsies :smiley_cat:

[ci skip]
Only showing link to job with args if job is present

Fixes #359
Merge pull request #363 from meatballhat/v2.5.4-prep

Bumping to v2.5.4 as we've hit the milestone
Updating HISTORY for 2.5.4
Merge pull request #362 from meatballhat/299-resilient-lock-timeout-attribute

Ensuring lock #timeout= behavior is consistent based on locked state
Merge pull request #364 from meatballhat/359-not-exploding-when-job-not-found-for-timestamp

Only showing link to job with args if job is present
Merge remote-tracking branch 'upstream/v2.x-stable' into merging-v2.x-stable

Conflicts:
	.rubocop.yml
Merge pull request #366 from resque/merging-v2.x-stable

Merging v2.x stable