Add git conflicts and edit-conflicts aliases

List conflicted files in a format that can be consumed by vim
with vim `git conflicts`. Edit in $VISUAL editor with `git
edit-conflicts`