Merge pull request #223 from Gormogon/master

EditorConfig

.editorconfig

@@ -0,0 +1,13 @@
+# http://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+
+[*.{py,cpp,h}]
+indent_style = space
+indent_size = 4
+insert_final_newline = true

HACKING.md

@@ -70,6 +70,8 @@ You can use the `hacking/calamaresstyle` script to run
 [astyle](http://astyle.sf.net) on your code and have it formatted the right
 way.
 
+**NOTE:** An .editorconfig file is included to assist with formatting. In order to take advantage of this functionality you will need to acquire the [EditorConfig](http://editorconfig.org/#download) plug-in for your editor.
+
 Naming
 ------
 * Use CamelCase for everything.