Added 'git failed' alias for quickly finding any files with merge conflicts

Signed-off-by: Michael Welter <michael@cetoncorp.com>
Updated to work w/ older versions of git

Signed-off-by: Michael Welter <michael@cetoncorp.com>