Merge branch 'develop' into 'master'

Develop

See merge request back-end/elastalert!20

Author: martijnrondeel

CONTRIBUTING.md

@@ -85,11 +85,14 @@ Controllers expose API that can be used by the handlers. There are a couple thin
 
 - be a class named `[controllerName]Controller`
 - use a logger to log important stuff. You can create a new logger by:
+
     ```javascript
     import Logger from 'path/to/common/logger';
     let logger = new Logger('[className]');
     ```
+    
 - have an instance of it accessible by the `ElastalertServer`. In the `start()` function in the [`ElastalertServer`](../src/elastalert_server.js) you see 
+
     ```javascript
     config.ready(function () {
       try {
@@ -100,10 +103,13 @@ Controllers expose API that can be used by the handlers. There are a couple thin
     });
     ```
     You should add an instance of your controller there:
+    
     ```javascript
     self._controllerNameController = new controllerName();
     ```
+    
     You should also provide a getter for the controller:
+    
     ```javascript
     get controllerNameController() {
       return this._controllerNameController;

README.md

@@ -187,7 +187,7 @@ This server exposes the following REST API's:
     Allows you to edit the ElastAlert configuration from `config.yaml` in `elastalertPath` (from the config). The required body to be send will be edited when the work on this API is done.
 
 ## Contributing
-Want to contribute to this project? Great! Please read our [contributing guidelines](../CONTRIBUTING.md) before submitting an issue or a pull request.
+Want to contribute to this project? Great! Please read our [contributing guidelines](CONTRIBUTING.md) before submitting an issue or a pull request.
 
 **We only accept pull requests on our [GitHub repository](https://github.com/bitsensor/elastalert)!**