Update to ReactiveCocoa 2.x and cleanup a little