Updating some vim and git config.

git/gitconfig

@@ -12,7 +12,9 @@
 	autocrlf = input
 	safecrlf = warn
 	excludesfile = ~/.gitignore_global
-[amazon]
-	append-cr-url = true
+[merge]
+	conflictstyle = diff3
 [push]
 	default = simple
+[branch]
+	autosetuprebase = always

vim/vimrc

@@ -22,6 +22,9 @@ NeoBundle 'altercation/vim-colors-solarized'
 NeoBundle 'Lokaltog/vim-powerline'
 NeoBundle 'gcmt/wildfire.vim'
 NeoBundle 'runar/vim-css-color', {'branch': 'scss-support'}
+NeoBundle 'digitaltoad/vim-jade'
+NeoBundle 'groenewege/vim-less'
+NeoBundle 'fatih/vim-go'
 
 NeoBundle 'git://git.wincent.com/command-t.git'
 
@@ -44,6 +47,7 @@ elseif has("gui_win32")
     set guifont=Consolas:h11
 end
 " Setup Some of the look
+let g:solarized_termtrans=1
 set t_Co=256
 set title " Makes titlestring change the window title.
 set noicon " See the help.
@@ -124,7 +128,7 @@ nnoremap <silent> <Leader>f :CommandT<CR>
 nnoremap <silent> <Leader>b :CommandTBuffer<CR>
 noremap <F5> :CommandTFlush<CR>
 let g:CommandTMatchWindowAtTop=1
-let g:CommandTWildIgnore=&wildignore . ",**/bower_components/*,**/node_modules/*,**/build/*,**/web/htdocs/static/*"
+let g:CommandTWildIgnore=&wildignore . ",**/bower_components/*,**/node_modules/*,**/build/*,**/web/htdocs/static/*,*.class"
 let g:CommandTCancelMap=['<C-c>', '<Esc>']
 
 " Take care of some bells