Bunch of fixes. Refactor some scrap cost calculation to include the salvage upgrade in a central location. Tech tree UI costs/values now reflect salvage upgrade effects.