Merge remote-tracking branch 'segmentio/master' into ignores-support

Conflicts:
	lib/index.js
	package.json
	test/index.js