Remove redis, add vows
Merge