Merge pull request #260 from brakhane/master

Fallback to JSON highlighting if subtype contains json