pulling to integrate matt's box2d fixes
Merge branch 'master' of https://github.com/afahim/warioware