Cleaned up armour of thorns and israfel aftereffects

I think this finally closes #341.
Merge branch 'master' of github.com:i7/kerkerkruip