nginx: fix log error msg text
Merge pull request #448 from vaijab/fix_nginx_log_msg

nginx: fix log error msg text
Fixes #443, defaults to non-blocking mode for cpu usage collection.
Disable gridengine by default, also update docs
Fixes #449, this uses the direct python names when installing in a virtual env
Add a Bitdeli badge to README
Merge pull request #450 from bitdeli-chef/master

Add a Bitdeli Badge to README
Merge branch 'master' of https://github.com/BrightcoveOS/Diamond