Various/20140423

Various changes, mostly motivated by making it easier to write YAML - particularly for enrichers, where using config  keys is fine but using code-based-builders is not.