Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	README.md

.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = tab
+indent_size = 4

README.md

@@ -1,13 +1,4 @@
-Coloresque
-==========
-
-***
-
-**Important!** If you experience any lags in css/html/less/sass files please update to latest version(0.9.5) of plugin.
-
-The issue [#13](https://github.com/gorodinskiy/vim-coloresque/issues/13) from 26.09.2013. Sorry for the inconvenience.
-
-***
+# Coloresque
 
 ![pic](https://raw.github.com/gorodinskiy/vim-coloresque/master/screen.png)