added height/width
Merge branch 'master' of https://github.com/stdwanze/FallingJim
cleanups + new aabb based collision detection