Update branch to changes in master

 * Update to new config format
 * Validate Salvage settings
 * Move getRepairAndSalvageQuantities to SkillUtils