p4 merge helper scripts
update gitconfig and shell scripts