Implemented a flag for a different RPC port; --rpcport
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Fix merge conflict