Updated to allow watching mode to work with HTML files.
Version bump, v0.2.1.
Merging upstream 'master' changes into this branch