Remove old bootstrap script; not necessary since Ubuntu 13.04
Set the default mergetool to Meld in git config