Improve meta.tag matching

No longer specially target entities within source.* documents as it was causing issues with tags when used in source files.
Improve meta.tag matching

Match tags in places other than solely HTML files.
Merge remote-tracking branch 'upstream/master'