Update NOTICE
Fix #457 - Timeout default to 30 seconds but can be overrided using --timeout circusctl option
Merge pull request #456 from victorpoluceno/master

Update NOTICE
make sure we can set streams from the CLI see #445
make sure we can change hooks via CLI - #455
complementary docs on hooks
back to 5
Merge branch '457_circusctl_timeout_regression'
Change nginx proxy headers in documentation

Allow for SSL access to the web console without breaking the stats'
WebSocket.
Add workaround for combined use of WebSockets and HTTP auth in doc
Merge pull request #460 from swordofpain/better-nginx-config

Better nginx config
Added _ and - to the characters allowed in config args variables
Allow watchers to get the pid of other managed processes in the cmd args
Added --config option to add command in order to load settings from a config file
added "fake" upgrade command
Added watcher dependencies
Improved status command to show more info about running processes
Removed bytes2human from memory stats
Improved upgrade message
Fix circus variable regex broken in merge