Updated slingshot to latest trunk