Replace trailing-whitespace plugin with bad-whitespace since it allows toggle
Merge branch 'master' of github.com:vellvisher/dotfiles

Conflicts:
	.gitmodules