Update for playtest-20131215.
Merge pull request #75 from pchote/new-playtest

Update for playtest-20131215.