got rid of extraneous keyword arguments; unit test for cancel action
forgot to add cancel!
Merge branch 'master' of https://github.com/PhantomPhreak/counterpartyd