• Merge branch 'master' of github.com:loggly/install-script into ivan-u…

    …pdates
    
    Conflicts:
    	configure-syslog.py
    ♥ Ivan Tam ♥
    ♥ Ivan Tam ♥ committed Aug 31, 2013