Merge branch 'develop' into 'master'

Update master

See merge request back-end/elastalert!25

Author: martijnrondeel

package.json

@@ -30,6 +30,7 @@
     "object-resolve-path": "^1.1.1",
     "randomstring": "^1.1.5",
     "raven": "^2.3.0",
+    "request": "^2.85.0",
     "tar": "^4.4.1",
     "fs-extra": "^5.0.0",
     "request-promise-native": "^1.0.5"