- adding support for setting/retrieving watch options and settings
- fixing typo in log command preventing compilation in safe mode
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ttwatch/ttwatch.c