Make sure to also remove the job as part of the reque process.

I might be wrong, but I believe, requeue_and_remove should always be the preferred.
Otherwise a second failure and you end up with duplicate jobs.

I tried to allow it to support both Resque 1.2x and 2.x APIs.