Added new timestamp function to bash
Added new configs for kdiff3 and p4merge