Updated to follow latest practices

After https://github.com/my-koop/service.website/issues/204 and https://github.com/my-koop/service.website/issues/212.

<!---
@huboard:{"milestone_order":3.0,"order":4.875}
-->