Further merge fixes and improved option handling

These commits fix some merge-related problems, introduce support for all options except "masked" to the gEDA backend and add a support for rounded pads for qfn packages (default square).