copy env
manually checking for osx to skip some tests, since unittest.skip is not available under python 2.6
updated activate/deactivate to restart the virtualenv during restart, and to move the conveyord log to conveyord_RELOAD_DATE_.log
rebuilt start/end/restart/stop batch scripts to match the release branch
fixes so conveyor.conf no longer references submodules
fixing some s3g launching issues
updated to include mock in python pip install
manual merge to create PreRelease from master and release
updating test.bat to start conveyord for post-build on server testing
fixed recursion problem
removed windows testing for server debugging
yet another change to test.bat for server testing
Merge branch 'master' into PreRelease
Make location of unix domain socket consistent with the python default
Merge branch 'master' into PreRelease
Merge branch 'master' into PreRelease
updating debian doc (mainly a test of git)
Merge remote-tracking branch 'upstream/master' into PreRelease
moving to s3g-surprise
updated s3g to support rep2 detect