Resolved a merge conflict
I'm getting tired
Added time info in README
Updated docs to reflect move to ReactiveX
Merge branch 'develop' of github.com:dbrattli/RxPY into develop
Updated setup to reflect move to ReactiveX