vim: Whitespace fixes.
Merge branch 'develop' of github.com:den-mentiei/dotfiles into develop