[vim] changed comment
[gitmodules] fixed conflicts
[vimrc] ignore dirty whitespace plugin files
[vimrc] remove trailertrash plugin for gitmodules