Feature/mongo 2.6.5 matcher mod

More formatting fixes, added tags to the clone.