Patch to fix trap objects

[Jason Green]

This patch updates the traps.xml to the new format so that all of the
traps in converted levels will at least get called.  I've tested
some of the traps, and some of their code needs updating as well. 
This patch includes the code to fix the guillotine.  Hammer seems
to work fine with this trap.

I tested these on a converted playable/indiana-yingwan.pingus, which
I've also attached (substituting the hammer for a guillotine).

fix_traps.diff
Description: Binary data

indiana.pingus
Description: Binary data