Trump, Gingrich team up drafting new 'Contract with America'