Some berries missing tabs, fixed.
Missing comma local
Merge branch 'natural_gift' of http://github.com/nmodi/Pokemon-Showdown into natural_gift