Move to canon ES-1.
Minor fix for contracts.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop