Revert "Revert "always merge arguments of "-file" parameter""

This reverts commit 097e46f61bbc5ea1762eee8fa09c12f7dec5f561.
always merge arguments of "-file" parameter, again

also, restrict lump numbers returned by R_FlatNumForName()
into the "flats" range

fixes #20