Trailing wgitespace highlight
Merge branch 'master' of https://github.com/odcinek/dotfiles

Conflicts:
	.vimrc