kill some dead code.
Merge branch 'master' of github.com:badgerman/eressea
Merge pull request #38 from badgerman/master

Testing pull request builds with Travis