Vampire fixes

Fixes a span class overspilling into plaintext, cleans up a commented out pointless hackaround, lowers the Secret reqs a bit to factor in our pop and the apparent interest in playing it, fixes the one-vamp-at-20 issue by making the game scale it upwards from 1, not zero - so that there will be two vampires for the 10-19 player range, instead of 1.
Switch/checkout is your friend. Fetch from upstream, then switch to upstream/master, overriding your previous loacal master branch. Then pull from master and all should be well.