Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	after/syntax/css/vim-coloresque.vim

.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,24 +1,15 @@
-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)
 
 color preview for vim.
 
-###Overview
+### Overview
 
 This is merge of [ap vim-css-color](https://github.com/ap/vim-css-color) and [colorizer](https://github.com/lilydjwg/colorizer).
 The main goal was to fix cursorline [bug](https://github.com/skammer/vim-css-color/issues/12) and keep named colors(i.e. white, black, aqua). I ended up mixing both plugins plus wrote some stuff, so I decided to leave it as a separate plugin.
 
-###Installation
+### Installation
 
 Via [vundle](https://github.com/gmarik/vundle):
 
@@ -26,7 +17,7 @@ Via [vundle](https://github.com/gmarik/vundle):
 Bundle 'https://github.com/gorodinskiy/vim-coloresque.git'
 ```
 
-###Features
+### Features
 
 You can still use hsl(a)