• Merge branch 'master' of github.com:rhigdon/install-script into rhigd… 

    …on-updates

Conflicts:
	configure-syslog.py
    @rhigdon
    rhigdon committed Aug 30, 2013
    64c9e20