Fix #231: tokens.xml no longer overwritten by cards.xml.

Apparently the fix was exactly as simple as I thought it wasn't. @Psithief does this fix the issue?
Can you call this `includeTokens`?