Annotation style and behavior tweaks
Merge branch 'dev' of https://github.com/pattern-lab/patternlab-php into dev