Merge pull request #6 from MilkBowl/master

sync
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixed problems with last commit for bPerms2 update
Merge pull request #339 from mung3r/master

bPerms2 fixup