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.
Merge pull request #1612 from alphagov/merge-master-before-running-tests

Attempt to merge master before running tests