Fix #6

Update fronted toolkit as part of compile, and check for git merge
problems which can cause broken links to be deployed.
Merge pull request #8 from alphagov/more-robust-compilation

Chatted through with @jabley, all understood and makes sense.