Holy shit, that was an epic merge fail. Fixed. Jumping works again :D