Initial commit, just a few changes from the stock Meteor repo