Confusion recoil no longer crits
Moved pseudo switch moves to their proper position
Implemented trappping moves like fire spin
Merge pull request #23 from CarlosFdez/master

Knocking stuff off the todo list