Merge pull request #147 from dmend/master

Renamed some Correlator stuff
Added durability and encription to correlation info.