Merge pull request #21 from d3athrow/master

Merging master into bleeding edge
Fixed more runtimes, reverted bay taser nerf. Too hardcore man
Merge pull request #22 from d3athrow/Bleeding-Edge

Bleeding edge