travis-ci should only run on master
GameState now keeps track of cards in play with a map
fix haddock for rotate
Merge remote-tracking branch 'upstream/master'