multi-ghc-travis: update to latest git version and install both scripts

We're using the names 'make-travis-yml' and 'make-travis-yml-2' now, which
feels more in-line'ish with the Cabal file hvr is distributing.