Clean up some formatting
Merge branch 'master' of https://github.com/jd4565/Pokemon-Showdown

Conflicts:
	chat-plugins/trainer-cards.js