Revert "Revert "Merge pull request #40 from alphagov/add-placeholder-support""

This reverts commit f8de27fd6fbb442ceabea11072efba4c4c9d7b74.
Merge pull request #45 from alphagov/re-add-placeholder-support

Add placeholder support