Merge pull request #87 from Z-Machine/master

Warlocks update, removed prints edition.