Fixes to the setup.py script
Merge branch 'master' into nagios_reporter