WIP
changing the test back to the way it was before
moving tests around as this implementation sucks and I want to add a better one for new tests
adding new style test support since it's such a PITA to use the old one, old left for backwards compatability
changing to use respond in the socket.io handler
removing noise from pushd popd operations
Merge remote-tracking branch 'origin/prod' into jsonp