Add --capabilities flag
Merge branch 'master' into add-CAPABILITY_IAM-to_cfn-create-stack

* master:
  Add <logglyendpoint> token
  Update loggly.conf with new Loggly Gen2 shipping method
Merge pull request #237 from cityindex/add-CAPABILITY_IAM-to_cfn-create-stack

Add --capabilities flag
Make test data import sleep longer /fixes #234
Update the GC flags we're using /issue #230
Switch back to c1.medium as the default
Pull kibana from github.com/cityindex/kibana with the timeout patch
Pull kibana from github.com/cityindex/kibana with the Histogram and Term timeout patch
Merge pull request #246 from cityindex/pull_kibana_from_cityindex_kibana

Pull kibana from github.com/cityindex/kibana with the timeout patch
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