Merged the effect refactoring work into master

Completed redid how effects are done.  Moved to a tag based system, which can be
easily serialized, is almost compatible with Focus, and down the road, will
allow for JSON specified cards.