Fix escaping attributes.

Removed [0] which did not fit with the current spec.
Fix for Match change in else branches.
Merge pull request #6 from colomon/master

Bring up to current p6 Match spec.