Move serialization into Token.URLSerializer
Clean up last commit
Merge branch 'token-serializer' into swift