Add aliases for beaus scripts
Use p4merge w/o script