Remake weakness command to allow resistance

The weakness command also includes the resistances of the Pokémon
Example: http://i.imgur.com/kZexUes.png
(Credits to Morfent for helping out)
Put weaknesses and resistances on separate lines
Fixes for Skull Bash
It boosts user stats even if Power Herb activates, but only since Gen 2.
Merge pull request #1109 from Ridaz/patch-5

Remake /weaknesses command to allow resistance
Optimizing /weakness command

Aesthetic changes and smoothing up the code

http://i.imgur.com/OIl0Mrd.png
Merge pull request #1116 from Ridaz/patch-6

Optimizing /weakness command
Remove ´watchFile´ global
Also, calls to ´fs.watchFile´ are no longer embedded in try-catch blocks, as its call would only crash in some platforms (Windows) in versions of Node.js no longer supported (before Node v0.8.0).
Merge pull request #1117 from Slayer95/watchfile

Remove ´watchFile´ global
Flame Charge is not a valid STAB
fix /weak a bit more
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/commands.js