Some cosmetic
Add basic auth to couch base fix #787
Add basic authentication to lighttpd check
Add basic authentication support to nginx check fix #635
Merge branch 'master' into add_basic_auth
Fix nginx check
Merge pull request #800 from DataDog/add_basic_auth

Add basic auth support to lighttpd, nginx, couchbase
Revert "Use url join to build haproxy url, fix #611"

This reverts commit 7c3dba086da5e133d3f27cde36260e857eb73118.
Better fix for haproxy issue fix #611
Merge branch 'master' into bundle-python-dep
Properly pass pythonpath to travis