Correct spacing, strip tags from YAML file

Hi ttk,

Sorry, merged config but didn't fully test it. Had tab characters all through it, which drives YAML parser nuts. Stripped them out.

Cheers,

Tim