diff --git a/configs/vimrc b/configs/vimrc
index 6de169f..796b43d 100644
--- a/configs/vimrc
+++ b/configs/vimrc
@@ -61,7 +61,7 @@ set undofile			" saves undo changes in a separate file, so we can undo anytime
 set lcs=tab:¦\ 			" uses a special char at the start of a tab character, uses spaces after that
 set nolist				" ... but don't display them by default
 
-let mapleader=","     " use comma to start user-defined (in plugins) functions
+let mapleader=" "       " use space to start user-defined (in plugins) functions
 
 syntax sync minlines=1500	" increases the number of lines to find the proper syntax
 
@@ -125,6 +125,8 @@ Plugin 'tomasr/molokai'
 Plugin 'Glench/Vim-Jinja2-Syntax'
 Plugin 'fmoralesc/vim-pinpoint'
 Plugin 'gorodinskiy/vim-coloresque'
+Plugin 'kchmck/vim-coffee-script'
+Plugin 'mattn/emmet-vim'
 
 " Project tree
 Plugin 'scrooloose/nerdtree'
@@ -141,6 +143,9 @@ Plugin 'Shougo/vimshell.vim'
 " Undo
 Plugin 'sjl/gundo.vim'
 
+" Editor configuration
+Plugin 'editorconfig/editorconfig-vim'
+
 " Mega-autocomplete
 " Plugin 'Valloric/YouCompleteMe'
 
@@ -238,6 +243,9 @@ au FileType mail setlocal spell spelllang=en
 " place than Python.
 au FileType javascript setlocal expandtab tabstop=2 sw=2 sts=2 textwidth=0
 
+" Default style for cofeescript files
+au FileType coffee setlocal noet ts=2 sw=2 sts=2 list
+
 " Default JSON styles
 " Every file with the extesion "json" should have the filetype "json";
 " Use spaces instead of tabs and use 4 spaces for it.