use s for stateAt block number param to prevent conflict with bData and such, some style fixes
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into rpcstateat
Merge pull request #317 from caktux/rpcstateat

use s for stateAt block number param to prevent conflict with bData and such, some style fixes