Merge pull request #60 from gsalgado/vp

Fix branchOrder to return an error if it's given an invalid branch number
[trivial] Add a TODO to GetDepositScript in rpcserver.go