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

Conflicts:
	vimrc

diff --cc vimrc
index a7ee5c0f00e8c5618fb98dc60dbde059612433d3,3998d1dcde2b2742bbd112c78fff8413d653ae25..3cd27978ead912402fd0b57832f7ed0b31bb3467
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -146,8 -146,7 +146,9 @@@ 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
  "