Switch to using the new Meteor-NPM integration, and some small improvements