Use 'P' as the default block tag
Merge branch 'default-block-tag'

Conflicts:
	src/lib/normalizer.coffee