Add an option to load a virtualenv site dir
Merge pull request #357 from ThomasChiroux/master

small fix for issue #356
removed flake
commads: fixed uid/gid validation.
commands: fixed convert env option.
Merge pull request #359 from andrewsmedina/convert_env_option

commands: fixed convert env option.
Merge pull request #358 from andrewsmedina/uid_validation

Fixed uid/gid validation
added myself to contributors list.
Merge pull request #360 from andrewsmedina/notice

added myself to contributors list.
fixed convert_option testcase.

using unitest2.
importing unittest from circus.tests.support.
Merge pull request #361 from andrewsmedina/convert_option_py26

fixed convert_option testcase to works on python 2.6.
changing tabs to spaces
Merge pull request #362 from mattlong/master

Configuration documentation formatting error
Fixed typo, thanks @davecoutts - fixes #365
fixed syntax thanks @mattlong - fixes 363
added on_demand watchers
Update configuration.rst
Merge pull request #373 from unbit/master

Add on_demand Watcher option
added Roberto