Merge pull request #299 from chadlung/master

Add @timestamp field for compatibility with Kibana 3
more concise naming of sinks and stores, order config file settings in a clearer order
Merge remote-tracking branch 'upstream/master'
pep8 fix
Merge pull request #300 from stevendgonzales/master

clarify namimg between stores and sinks, reorder of config file values to group like settings together
add HDFS transaction expire and transaction frequency to conf file
change datasource handler for chbootstrap
Merge pull request #302 from stevendgonzales/master

add HDFS transaction expire and transaction frequency to conf file, and change datasource handler for chbootstrap
Update VERSION
Update VERSION
update packaging scripts to fix silly remove/upgrade problems
Merge pull request #303 from zinic/master

Update the Packaging Scripts
version bump
Merge pull request #304 from zinic/master

bump bump
version bump
Merge branch 'master' of github.com:ProjectMeniscus/meniscus
one last version bump
updating normalizer code a bit to be more in line with the cee names used during correlation
Merge pull request #305 from zinic/master

Small Changes to Normalizer Code