Add stubs for ci_latency_monitor_bot tests
(broken) lumberjack shipper infrastructure
Merge branch 'master' into parse_type_ci_latency_monitor_bot

* master:
  Pull kibana from github.com/cityindex/kibana with the Histogram and Term timeout patch
  Pull kibana from github.com/cityindex/kibana with the timeout patch
  Switch back to c1.medium as the default
  Update the GC flags we're using /issue #230
  Make test data import sleep longer /fixes #234
  Add --capabilities flag
Basic "ship using lumberjack" test - PASSES !
Cleanup do-impotr-lumberjack
Wait for logstash-redis to finish parsing by watching /var/log/app/logstash_redis-1.log (won't work if not in DEBUG mode)
Wait until last line of input .log appears in output
Run rake logstash:redis_to_elasticsearch rather than app-logstash_redis service
Switch to json format
Add some type tests
add missing filter.d/json.conf.erb
Merge pull request #239 from cityindex/parse_type_ci_latency_monitor_bot

Add @type:ci_latency_monitor_bot parser