Merge commit 'b5aae6af950a8995696244ea5f833e19d9a92b2b' into refactor_merge

Conflicts:
	src/resweb/server.py
	src/tests.py

Author: Matt George

pyres/failure.py

@@ -33,10 +33,10 @@ def save(self, resq):
             'queue'     : self._queue
         }
         data = ResQ.encode(data)
-        resq.redis.push('failed', data)
+        resq.redis.push('resque:failed', data)
 
     @classmethod
     def count(cls, resq):
-        return int(resq.redis.llen('failed'))
+        return int(resq.redis.llen('resque:failed'))