Merge pull request #282 from stevendgonzales/master

Transition code for short-term sink and tagging correlation info for short term sink processing
Merge pull request #283 from stevendgonzales/master

fixing my booboo
Add a timestamp to correlation
Merge pull request #284 from chadlung/master

Add a timestamp to correlation
Update VERSION
test
Merge remote-tracking branch 'upstream/master'