More weirdo changes
Merge branch 'master' of github.com:ianblenke/docker-fluentd