bug fixes and tweaks
Merge branch 'drupal' of https://github.com/nzpost/nzpost-pattern-library into drupal