Moving platform collisions are a little better and the logic for solid
on top is a little better (like won't "bump" you up if you don't jump
high enough)
Remove unused param
Remove unused variable
Merge branch 'CollisionUpdates'

Conflicts:
	src/smw/entity/Player.java
	src/smw/settings/Debug.java