Match additional attributes of img tags.
Merge branch 'more-complete-image-tag-matching'

* more-complete-image-tag-matching:
  Match additional attributes of img tags.
Order attributes alphabetically for html generated w/ Slim-Templates.