Minor changes to the underlying data model.

- More consistent terminology.
- Temporarily made the deck 12 cards only.
- Modified shuffle to no longer return the RandomGen after.

Signed-off-by: Damian Lanningham <qrebound@gmail.com>