merge master
Rename 'logdir' to 'incident_dir'

The configuration variable 'logdir' was only used for the incidents
directory.
document incident_dir
Merge remote-tracking branch 'meskio/meskio' into truckee

Conflicts:
	docs/configuration.rst