tweak tool wrappers to support invocation from maven plugin better
update gitignorewq