Fix a bug related to attributes on conditional blocks

Adding attributes to a conditional block reference would cause an
exception to be raised.
Add a note about this being the v2 docs
Merge pull request #76 from zendesk/dasch/conditional-with-attributes

Fix a bug related to attributes on conditional blocks
Allow rendering collections inline in templates