Add support for tags containing attributes when matching on placeholders

Bonus: some whitespace cleanup by atom.io