Merged Rob's character controller changes
Rob's fix on player/arm interaction