commit from mac
Merge branch 'master' of https://github.com/stefanmonkey/zabbix_configuration

Conflicts:
	nginx_analyze/etc_parse.py
	nginx_analyze/nginx_site_discovery_test.py