Conflicts: README.md docs/configuration.md lib/executor.js package.json Changes in the docs were merged manually and updated to correctly describe the 2.x layout.
Miroslav Bajtoš