Local duplicate changes
Merge branch 'master' of https://github.com/soldieroflight/drunken-octo-dangerzone
Fixed jump physics and moved particles into their own update/draw lists