Fix charge_stick potential array issue
Tweak banning code a bit, allow *
Merge pull request #46 from ensiform/52f82eedf190

Moar commits for u
Merge remote-tracking branch 'upstream/master'