Revert "Revert "Merge branch 'pr/16'""

This reverts commit 10089f37719dd0857bb2ad2ce74a0c4bede3282d.
Revert "Revert "Merge branch 'master' of https://github.com/IndigoShowdown/Pokemon-Showdown""

This reverts commit 25b5e86382db4900a96c824d644d84214fd9d551.