update to make the merged files, the aux files and the friend files different types
added support for different types of files having different naming conventions, also made a small bug fix to force 1D spectra that were drawn with log y axis to not affect 2d spectra