Small change for the "none" type, soon to be updated
Moved in-memory test files to real test files. unit test must run under Research/test
An api to run basic queries against ES
Added functionality to re-parse the pcap filenames
Further refactor in prep for updates, but there is an index calculation
necessary that will have to happen next
Updated test to deal with the actual CPU values
Added some unit tests and the ability to update in ES (and take
failures in stride) when deleting capture files
Merge branch 'master' of 10.1.10.78:Logrhythm/Research into CapturedFalseWhenFlowsDeleted2
cannot add docs with updates, need to update them.  Unit tests will
be forthcoming for the new UpdateDoc api
Quick unit test fix
Another fixed test
One last test modification, this is ready
Code review changes, and hopefully a fix for when ES failes an update
Added unit test for new helper files FileIO (read and write files)
Updated ConfNtp to reflect the changes
Updated field names
Merge branch 'master' of 10.1.10.78:Logrhythm/Research into UpdateRename

Conflicts:
	source/liblrdpi/RuleEngine.cpp
Merge conflict issues
Merge pull request #353 from kjell-hedstrom/CpuSystemToGraphs

Updated test to deal with the actual CPU values
Merge pull request #355 from Robert-Weber/UpdateRename

Update rename
Updated after meld review