minor things

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Merge branch 'master' of github.com:FellowTraveler/Open-Transactions
I wish I knew why a merge was necessary. I wish it told me why before dumping me into this editor, in fact.
Merge branch 'discard' of github.com:FellowTraveler/Open-Transactions into discard
opentxs discard, opentxs cancel, etc


Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>