Fix collectd regex /issue cityindex/logsearch-config#35
finish renaming ci-elasticsearch-development-flow to ci-logsearch /issue #258
Fix collectd regex /issue cityindex/logsearch-config#35
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
switch elasticsearch instance type to m1.xlarge
add script to simplify deleting empty indices
move *index template* to correct location
add proper test for partial hosts
switch to more complete api delete
fix discrepancy in mapping template
Merge branch 'master' into naming-refactor
changing release task