White Sox sign Kelvin Herrera to two-year deal