Updated mergeKiMods to better merge module files
Merge branch 'master' of https://github.com/douggilliland/DougsPCBDesigns