Feature/mongo 2.6.5 matcher atomic

Mostly formatting changes.