IsEnvironmentTarget and IsVillainTarget aren't correct (targetKind not fully general)

[jamespicone]

public bool IsEnvironmentTarget
{
	get
	{
		if (TargetKind != DeckDefinition.DeckKind.Environment)
		{
			if (IsEnvironment)
			{
				return IsTarget;
			}
			return false;
		}
		return true;
	}
}

IsVillainTarget has the same pattern. This isn't correct; a card with kind: "Environment" and targetKind: "Villain" will return true for IsEnvironmentTarget.

In general, targetKind only works if:

• kind is Other
• targetKind is Environment or Villain.

Any other combination won't be treated correctly by the engine or base game cards.