Rename correlator.
Merge pull request #147 from dmend/master

Renamed some Correlator stuff
Added durability and encryption to correlation info.
Merge pull request #148 from dmend/master

Added durability and encryption to correlation info
Merge remote-tracking branch 'upstream/master'