up to date, ready to merge

See merge request general/log!2

# Conflicts:
#   README.md
#   package.json

Update index.test.js, examples/all-options.js, examples/log-to-file.js, examples/no-options.js, package.json files