trailing whitespace plugin
Merge and fix conflict

Conflicts:
	.vimrc