merge development branch

@ryansobol That was the way I originally did it, but I changed it to an options hash since I thought that ```Deck.new(true)``` was less clear than ```Deck.new(shuffle: true)```. I've changed it to the way you said, but what do you think about that reasoning?