Bash: add Araxis tools to PATH, reformat commands
Git: switch merge tool to Araxis