Cleaned up my mess of .orig files from my poorly done rebase/merge.