Added redis
Upgrade to logstash 1.4.1
Switch back to standard logstash init
Merge branch 'master' into develop