Obliterate trailing whitespace
Merge pull request #297 from kotarou3/whitespace

Obliterate trailing whitespace
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	commands.js
	config/commands.js
	data/formats.js
	mods/gen1/README.md
	mods/gen1/abilities.js
	mods/gen1/formats.js
	mods/gen1/moves.js
	mods/gen1/pokedex.js
	mods/gen1/scripts.js
	mods/gen1/statuses.js
	mods/gen2/formats.js
	mods/gen2/items.js
	mods/gen2/moves.js
	mods/gen2/scripts.js
	mods/gennext/README.md
Fix syntax error from merge