Gary Rowett signs new Derby deal to end Stoke speculation