Pull request

1. use upsert because old system was too slow for us.

2. return an object with stop & ready methods (even though they don't do anything) for consistency with subscribe, usability with code that processes subscriptions (e.g. iron router)