fixed nginx test, added haproxy transformer
refactored into separate files. added preprocessor for macros. key watching, some more