Refactor Action, per new names.ActionTag changes, and to improve internal structure
merge latest from trunk
update bodie's code with new signatures
Update state/api and state/apiserver usages of new api too, address @howbazaar's comments
Merge branch 'master' into action-tag-refactor
Merge branch 'master' into action-tag-refactor
Merge pull request #164 from johnweldon/action-tag-refactor

Refactor Action, per new names.ActionTag changes...

... and to improve internal structure.