Merge, fix conflicts.

diff --cc dotvimrc
index 527da0aa87fe0ad7aa7b0239ccbbc34ad3706fa3,a1d6824c97b4c6981ee32b5e1a5cb630ecb54fba..8e1da2fca44f56964499c8d3b121fc429917939f
--- 1/dotvimrc
--- 2/dotvimrc
+++ b/dotvimrc
@@@ -22,8 -26,7 +26,8 @@@ autocmd FileType make setlocal noexpand
  
  au BufNewFile,BufRead *.json set filetype=javascript
  au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx
- au BufNewFile,BufRead *.md setlocal textwidth=80
 +au BufNewFile,BufRead *.less set filetype=less
+ au BufNewFile,BufRead *.md,*.txt setlocal textwidth=80
  au BufWritePost *.py call Flake8()
  au BufWritePost *.js :JSHint