Added try/catch around the deleting of the query result file. Also moved the file to the kairos cache directory rather than directly under /tmp.
Merge branch 'develop' of github.com:proofpoint/kairosdb into develop