Integrate Faye into Rails middleware stack
Fixed some bad merging