Design and Testing of a Combined Neutron and Gamma Assay System for Measuring Fissile Material in Fuel and Waste Items