Adding control C trap and some git support