Fix crash.
Fix crash.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	commands.js
Make sure 'cloud-env' won't crash server.
Revert "Make sure 'cloud-env' won't crash server."

This reverts commit db318698d7eb3cf7d7406abe3e8bd8b568104bbd.
Update .gitignore.
Merge branch 'master' of https://github.com/panpawn/pokemon-showdown

Conflicts:
	.gitignore
	commands.js
	config/commands.js
	config/formats.js
Merge branch 'master' of https://github.com/panpawn/pokemon-showdown

Conflicts:
	commands.js
	config/commands.js