merge in pc18 fix and sort out gitignores