Use victoryCardCount if kingdom card is victory card

Check whether card.vp is a function
Separate kingdomCardCount from NumKingdomCards

One refers to the number of distinct cards in the tableau; the other
refers to the count of cards in a starting pile.
Use isVictory() and move NumKingdomCards, fix styles
Merge pull request #2 from leekaiinthesky/master

Use victoryCardCount if kingdom card is victory card