Stopped Combo and Choose cards from being counted as battlecries.

Closes #46