Merge branch 'master' of github.com:rhigdon/install-script into rhigd…
64c9e20
…on-updates Conflicts: configure-syslog.py
