Upgrade to Meteor 1.0.2.1 + misc cleanup