Merging the infrastructure changes from Oliver: https://github.com/olyoberdorf/MASTDataDelivery.git

Setting up to make this more of a package.