Delete trailing whitespace in dev modes; cleanup general config
merge