Prettify FileSelectWindow layout
Add ability to specify merge output file, change "Save" button accordingly
Refactor DiffWindow population scheme
Fix duplicate changes found in merge
Adjust GUI
Enable FileSelectWindow's "OK" button only when input is valid