Add xunit-file dev dependency
Merge branch 'master' into log

Conflicts:
	package.json
[istanbul] Ignore else branch when there is no console