Merge pull request #40 from KingRaptor/master

!votemap with no args picks the random map before the vote, not after
Fix campaign progression (again!)
Site now preferentially reads wiki pages from GitHub; Markdown parser included