Remove use of deprecated methods
Merge branch 'master' of github.com:jtpalmer/Chipmunk