Removed vim-trailing whitespace
Added vim-better-whitespace