Closes #29.  Fixed an issue where card names within card names were
being linked incorrectly.