add ability to mark some keys as unspendable.
Merge remote-tracking branch 'upstream/master'