Update meteor version, refactor for collection2