Removed trailing whitespace
Merge pull request #14 from trcjr/master

Removed trailing whitespace
Merge remote-tracking branch 'origin/master' into yasuoza/master

Conflicts:
	colors/hybrid.vim