Merge an if :-)
Fix issue #10 - "Syntax highlighting doesn't highlight %w, %q, etc."

Currently the scanner reports %<letter><delimiter>contents<delimiter> as a string,
if in the future we see a necessity to put these constructs on their own class this
will be done.