notes
add per-host timeout
add stderr-to-file functionality
Tagging version '1.8.4'
Merge branch 'development'

Conflicts:
	.todo.txt