Merge branch 'master' of github.com:loggly/install-script into ivan-u…
b50f9cb
…pdates Conflicts: configure-syslog.py