Add support for spork and guard running together
Add spork/guard