equivalency upgrade to logstash 1.3.2 /issue #287
disable logstash managed template for now /issue #287
add auto-scaling elasticsearch cloudformation template /issue #282
add kibana cloudformation template /issue #270
update parent cfn template for auto-scaling and elasticsearch frontend /issue #270
dear travis, don't waste your time right now /issue #270
fix parameter name issue
sometimes copy and paste gets the better of me
sometimes reading gets the better of me
Merge remote-tracking branch 'origin/logstash-1.3.2' into 20140114
revert branched .travis.yml
fix inadvertent change /commit dcff8e5
Merge pull request #309 from cityindex/mergedtest-20140113

Rollup - Elasticsearch Auto-Scaling + logstash-1.3.2