modified:   subliminal/watcher.ini
	modified:   subliminal/watcher.py
Merge branch 'devel-watcher' into devel