Minor updates to environment setup

* Always use utf8 LANG env.var.
* Setup p4merge as git mergetool