From: Edward Delaporte <edthedev@gmail.com>
Date: Mon, 9 Mar 2015 21:36:51 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/edthedev/dotfiles
X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/commitdiff_plain/6ec9bafb8ea448b7a1dd4499994787e0df51f96b?hp=-c

Merge branch 'master' of https://github.com/edthedev/dotfiles

Conflicts:
	vimrc
---

6ec9bafb8ea448b7a1dd4499994787e0df51f96b
diff --combined vimrc
index a7ee5c0,3998d1d..3cd2797
--- a/vimrc
+++ b/vimrc
@@@ -130,7 -130,7 +130,7 @@@ let g:PyLintOnWrite = 
  " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913'
  " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913,E1002,E1103'
  " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1002,E1101,E1103,E1120,R0201,R0901,R0903,R0904,R0913'
 -let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
 +let g:PyLintDissabledMessages = 'C0103,C0111,C0301,C0322,C0323,C0324,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
  
  Plugin 'edthedev/arduino.vim'
  " Plugin 'edthedev/vim-arduino-ino'
@@@ -146,12 -146,11 +146,13 @@@ Plugin 'itchyny/thumbnail.vim
  " :Thumbnail
  "
  " Plugin 'farseer90718/vim-taskwarrior'
 +" let g:task_rc_override = 'defaultwidth=0'
 +" let g:task_report_name     = 'list'
+ " let g:task_rc_override = 'defaultwidth=999'
  " Read up on it here:  https://github.com/farseer90718/vim-taskwarrior
  "
  
 -" For REST APIs
 +" For REST APIs Press QQ in normal mode to open.
  Plugin 'nicwest/QQ.vim'
  
  Plugin 'scrooloose/syntastic'
@@@ -164,13 -163,6 +165,13 @@@ map <leader>a :BufstopModeFast<CR>     
  Plugin 'plasticboy/vim-markdown'
  set nofoldenable "Do not fold everything
  
 +" Ctrl P on steroids...
 +Plugin 'Shougo/unite.vim'
 +
 +" Better status line.
 +Plugin 'bling/vim-airline'
 +
 +
  call vundle#end()
  filetype plugin indent on     " required for Vundle Bundle
  
@@@ -193,8 -185,6 +194,8 @@@ au BufRead,BufNewFile *.md set filetype
  au FileType markdown set tabstop=2
  au FileType markdown set shiftwidth=2
  " au FileType yaml set expandtab
 +"
 +
  
  set softtabstop=4 " makes the spaces feel like real tabs
  " Sensible default for everything else.