--- a/.hgsubstate Fri Jan 28 15:32:41 2011 -0500
+++ b/.hgsubstate Fri Jan 28 15:52:20 2011 -0500
@@ -5,7 +5,7 @@
34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter
7650cdc6621cd15b047dc04605b8b0bc0396564d vim/bundle/nerdtree
-62830e8990b21280a5cc244568065abb085fe395 vim/bundle/sparkup
+c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
27710a2224d6dd0486d1c40d09ef18dd752e7d37 vim/bundle/surround
60731769663ea23b4763f3f0034da445ebcd3ddd vim/bundle/syntastic
b9b4407a19acc4eb344cca0cc5beea75e9ff5491 vim/bundle/vim-coffee-script
--- a/vim/.vimrc Fri Jan 28 15:32:41 2011 -0500
+++ b/vim/.vimrc Fri Jan 28 15:52:20 2011 -0500
@@ -148,6 +148,9 @@
au BufNewFile,BufRead *.html setlocal filetype=htmldjango
au BufNewFile,BufRead *.html setlocal foldmethod=manual
au BufNewFile,BufRead *.html nnoremap <buffer> <localleader>f Vatzf
+au BufNewFile,BufRead *.html inoremap <buffer> <s-cr> <cr><esc>kA<cr>
+au BufNewFile,BufRead *.html imap <buffer> <d-e><cr> <d-e><s-cr>
+au BufNewFile,BufRead *.html imap <buffer> <d-e><space> <d-e>.<bs>
au BufNewFile,BufRead *.less setlocal filetype=less
au BufNewFile,BufRead *.less setlocal foldmethod=marker