Bastion: Master merge plus some updates for asset pathing.