[vimrc] Updated ubuntu vimrc
  - fix vimdiff with space comparing
  - fix *.txt filetype=text NOT txt
[wiki fix] Renamed txt.vim->text.vim for ubuntu

  In ubuntu, *.txt will be recognized as filetype=text NOT txt
  Even if we define the ft=txt