updating whitespace shortcut to use vim-trailing-whitespace
Merge branch 'master' of github.com:netinlet/dotfiles