General Sam Tomkins returns for Warriors