Less frustrating attacks

I know this kinda breaks the animation for punching, but animation should always be secondary to playability.
Merge pull request #814 from jhoff/less_frustrating_attacks

Less frustrating attacks