Add contract addr if it's a contract creation tx
Merge branch 'develop' of github.com:ethereum/eth-go into develop