Attempt to merge master before running tests

To ensure we don't miss out on updates in master, and therefore merge
broken code, we should try to merge master into the current branch
before running the tests.

This is based on alphagov/specialist-publisher#118
Is this supposed to mean abort the merge, or abort the build?