vim now removes trailing whitespace
Merge branch 'master' of github.com:vheuken/dotfiles