Update tabs to spaces
Update Meteor and resolve conflict