Added the ability to recover CBMs from butchered shocker zombies.
Merge branch 'master' into shocker_changes

Conflicts:
	mtypedef.cpp
Merge pull request #170 from GlyphGryph/shocker_changes

Added the ability to recover CBMs from butchered shocker zombies.