Merge branch 'master' of github.com:chrisboulton/php-resque into improved-forking

Conflicts resolved:
	bin/resque

Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
Merge branch 'improved-forking'

Conflicts resolved:
	bin/resque

Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>