Merge pull request #865 from jonhyman/feature/swap-reduction-862

Fixes #862 (verified on 2.6.32-amazon-xen-r3 kernel)
Fix test breakage due to bad exit.

The last patch did exit! not exit, which, of course, killed our
exit hooks.
Bump redis-namespace version.

Fixes #771.
We don't need special JSON gems.

The JSON gem works everywhere just fine now.
Update failure count the right way.

This brings the two ways of reporting failure in line with each
other.

Closes #768.
Fix demo instructions to not use deprecated options.

Fixes #746.
Worker tries to reconnect to Redis up to 3 times

backport of 2bfc49ef05728ea0fe2817c35d75aeaa18df757f
Merging in 1-x-stable.
Merge remote-tracking branch 'origin/feature/swap-reduction-862' into feature/swap-reduction-862