Add Trey Jackson's useful ediff-both functionality

See http://stackoverflow.com/a/9846938/1156644