Improve git grep
Add bash edit_conflicts; open files with emacsclient if running