Re-organize bundles

editors/vim/bundles.vim

@@ -18,6 +18,8 @@ call vundle#rc()
     Bundle 'tpope/vim-haml'
     Bundle 'ecomba/vim-ruby-refactoring'
 
+    Bundle 'tpope/vim-cucumber'
+
     " " temporarily disable due to speed issues
     " "   see: https://github.com/tpope/vim-bundler/issues/4
     " Bundle 'tpope/vim-bundler'
@@ -30,18 +32,14 @@ call vundle#rc()
     Bundle 'tpope/vim-markdown'
   " }}}
 
-  " Other {{{
+  " HTML/CSS/Javascript {{{
-  Bundle 'tpope/vim-cucumber'
-  " Bundle 'ap/vim-css-color'
     Bundle 'kchmck/vim-coffee-script'
     Bundle 'pangloss/vim-javascript'
     Bundle 'css3'
     Bundle 'othree/html5-syntax.vim'
-  Bundle 'tyok/js-mask'
+    " Bundle 'ap/vim-css-color'
-  Bundle 'AnsiEsc.vim'
-  Bundle 'thisivan/vim-matchit'
-
   " }}}
+
 " }}}
 
 " Git {{{
@@ -116,6 +114,13 @@ call vundle#rc()
   imap <Leader>a> <Esc>:Tabularize /=><CR>a
   imap <Leader>a: <Esc>:Tabularize /\z:<CR>a
 
+  "" Assignments etc
+  " These need more work:
+  " TODO: - keep cursor position
+  "       - don't align equals sign if inside hashrocket
+  " inoremap => =><Esc>:Tabularize /=> <CR>a
+  " inoremap =  =<Esc>:Tabularize /=<CR>a
+
   " Auto-align
   "" Cucumber
   inoremap <silent> <Bar> <Bar><Esc>:call <SID>align()<CR>a
@@ -130,13 +135,6 @@ call vundle#rc()
     endif
   endfunction
 
-  "" Assignments etc
-  " These need more work:
-  " TODO: - keep cursor position
-  "       - don't align equals sign if inside hashrocket
-  " inoremap => =><Esc>:Tabularize /=> <CR>a
-  " inoremap =  =<Esc>:Tabularize /=<CR>a
-
   Bundle 'scrooloose/nerdcommenter'
   let NERDSpaceDelims = 1 " space between comment and code
   map  // <plug>NERDCommenterToggle
@@ -189,6 +187,11 @@ call vundle#rc()
   let g:syntastic_disabled_filetypes = ['cucumber']
 " }}}
 
+" Other {{{
+  Bundle 'AnsiEsc.vim'
+  Bundle 'thisivan/vim-matchit'
+" }}}
+
 autocmd BufWritePost bundles.vim source ~/.vim/bundles.vim
 filetype plugin indent on