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

diff --combined vimrc
index adcc2f5829438ffdbcc0e2f301ad5da873e3827f,b36d4503d2807dddaa62399e64f04159bb31bc61..59a77ce238db8a14853268c25f014b0f632df933
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -46,8 -46,7 +46,7 @@@ call vundle#begin(
  Plugin 'gmarik/vundle'
  
  " Helper scripts for editing ReStructuredText
- " Plugin 'edthedev/vim-rst'
- Plugin 'edthedev/text-helper.vim'
+ " Plugin 'edthedev/text-helper.vim'
  
  " EdTheDev's Minion file organizer.
  Plugin 'edthedev/minion'
@@@ -130,7 -129,7 +129,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,C0322,C0323,C0324,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,E0611,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
  
  Plugin 'edthedev/arduino.vim'
  " Plugin 'edthedev/vim-arduino-ino'
@@@ -146,6 -145,8 +145,8 @@@ Plugin 'itchyny/thumbnail.vim
  " :Thumbnail
  "
  " Plugin 'farseer90718/vim-taskwarrior'
+ " let g:task_rc_override = 'defaultwidth=999'
+ " Plugin 'farseer90718/vim-taskwarrior'
  " let g:task_rc_override = 'defaultwidth=0'
  " let g:task_report_name     = 'list'
  " Read up on it here:  https://github.com/farseer90718/vim-taskwarrior
@@@ -175,21 -176,6 +176,21 @@@ let g:vimwiki_list = [{'path': '~/Box S
  
  " Emacs style kill-paste ring
  Plugin 'vim-scripts/YankRing.vim'
 +"    :h yankring.txt
 +"    :h yankring-tutorial
 +
 +" Javascript
 +Plugin 'maksimr/vim-jsbeautify'
 +"Plugin 'einars/js-beautify'
 +Plugin 'Delapouite/vim-javascript-syntax'
 +"Plugin 'pangloss/vim-javascript'
 +
 +" HTML
 +Bundle 'othree/html5.vim'
 +"Bundle 'evidens/vim-twig'
 +"Bundle 'tokutake/twig-indent'
 +"Bundle 'groenewege/vim-less'
 +"Bundle 'hail2u/vim-css3-syntax'
  
  call vundle#end()
  filetype plugin indent on     " required for Vundle Bundle
@@@ -201,6 -187,7 +202,7 @@@ nn <S-space> <c-u
  
  " Don't show tabs for HTML files. Do show trailing spaces."
  au FileType html set nolist
+ au FileType javascript set nolist
  
  " Two spaces as tabs in .feature files.
  au BufRead,BufNewFile *.feature set filetype=yaml