Update rx for #61

This is a cursory upgrade and could be taken further. The tests all
pass, but I want to make sure this really works before cleaning up
further.

@mbossenbroek 
Just curious, I saw a few places that use rx/flatmap and some that use .flatMap - was there a reason for choosing one or the other?