Fixing fallout from merges.
Merge branch 'dominion' of github.com:courageousillumination/deckr into dominion