Merge 7175e8ac9b into e9171405cf

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE.md

@@ -1,26 +1,29 @@
+<!-- 
+Note:
+
 Please check the existing issues to make sure you're not duplicating a report.
-
 For bug reports, please provide the following information:
+In a terminal, run `zmanage info` and paste the output below: -->
 
-In a terminal, run `zmanage info` and paste the output below:
+#### Output of `zmanage info`:
+  ```
+  #Paste the output here
+  ```
 
-```
-#Paste the output here
-```
+##### Gist of .zimrc:
+  ```
+  #Paste the output here
+  ```
+##### Gist of .zshrc:
+  ```
+  #Paste the output here
+  ```
 
-- gist of .zimrc:
-- gist of .zshrc:
-
-Description
------------
-
-
-Steps to reproduce
-------------------
-
-
-Images or other information
----------------------------
+#### Description
 
+#### If the current behaviour is a bug, please provide the steps to reproduce it.
+<!-- A great way to do this is to provide screenshots and commands. -->
 
+#### If this is a feature request, what is the motivation or use case for the added feature?
 
+#### Images or other information