Merge pull request #64 from CGenie/merge_with_official

Better parsing of the _source parameter.
Closes #68
fixing NPE
issue 85
Merge pull request #86 from maxharp3r/master

issue 85 - allow sql from a file in the absence of sqlparams
ES 0.90 fixes for SimpleRiverMouth and HealthMonitorThread
(cherry picked from commit 34166b231b35c6e14c97a5271c74fb681161284d)