Add additonal completion matchers

- first pattern allows comp.h to match to compANYSTRINGCOMBINATION.h
- second pattern allows comp to match ANYSTRINGcompANYSTRING