Rephrase Placid Magic slightly
Merge branch 'cards' of gitorious.org:crawl/crawl into cards