- Added a Jinja compatibility option for the watcher.
- Small fix to watcher option "tag"
Merge branch 'fix_watcher_option_tags'

Conflicts:
	hamlpy/hamlpy_watcher.py
- typo fix.
Merge branch 'jinja_compat'