Token types should subsume versions

[martinthomson]

Having two fields is more complicated and brittle than having one. A new version can be managed by defining new types that are bound to a specific protocol version.

[dvorak42]

As part of #222 removing 'type' from most of the API should hopefully mostly resolve this, leaving just the token version in the crypto layer.