RxJS cleanup
Merge pull request #1 from mattpodwysocki/master

RxJS cleanup