fixes to collision and adjustments to jumping with gamepad and keyboard
Merge branch 'dev' of https://github.com/davidbeermann/econarchy into dev