diff --git a/README.md b/README.md
index bcf06d31907bc..de84f2a8ce46a 100644
--- a/README.md
+++ b/README.md
@@ -103,21 +103,22 @@ at 192.168.59.103:8086, tagging measurements with dc="denver-1". It will output
 measurements at a 10s interval and will collect totalcpu & percpu data.
 
 ```
-[outputs]
-[outputs.influxdb]
-url = "http://192.168.59.103:8086" # required.
-database = "telegraf" # required.
-
 [tags]
-dc = "denver-1"
+    dc = "denver-1"
 
 [agent]
-interval = "10s"
+    interval = "10s"
+
+# OUTPUTS
+[outputs]
+[outputs.influxdb]
+    url = "http://192.168.59.103:8086" # required.
+    database = "telegraf" # required.
 
 # PLUGINS
 [cpu]
-percpu = true
-totalcpu = true
+    percpu = true
+    totalcpu = true
 ```
 
 Below is how to configure `tagpass` parameters (added in 0.1.4)
@@ -125,15 +126,15 @@ Below is how to configure `tagpass` parameters (added in 0.1.4)
 ```
 # Don't collect CPU data for cpu6 & cpu7
 [cpu.tagdrop]
-cpu = [ "cpu6", "cpu7" ]
+    cpu = [ "cpu6", "cpu7" ]
 
 [disk]
 [disk.tagpass]
-# tagpass conditions are OR, not AND.
-# If the (filesystem is ext4 or xfs) OR (the path is /opt or /home)
-# then the metric passes
-fstype = [ "ext4", "xfs" ]
-path = [ "/opt", "/home" ]
+    # tagpass conditions are OR, not AND.
+    # If the (filesystem is ext4 or xfs) OR (the path is /opt or /home)
+    # then the metric passes
+    fstype = [ "ext4", "xfs" ]
+    path = [ "/opt", "/home" ]
 ```
 
 ## Supported Plugins
diff --git a/agent.go b/agent.go
index b35fae39083f8..2b0886be7ada7 100644
--- a/agent.go
+++ b/agent.go
@@ -74,6 +74,9 @@ func (a *Agent) Connect() error {
 		if err != nil {
 			return err
 		}
+		if a.Debug {
+			log.Printf("Successfully connected to output: %s\n", o.name)
+		}
 	}
 	return nil
 }
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 38f3232158d29..c7f8637786755 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -114,11 +114,8 @@ func main() {
 	}
 
 	shutdown := make(chan struct{})
-
 	signals := make(chan os.Signal)
-
 	signal.Notify(signals, os.Interrupt)
-
 	go func() {
 		<-signals
 		close(shutdown)
diff --git a/config.go b/config.go
index 516fee1e5aef7..19ebc00bf8d8d 100644
--- a/config.go
+++ b/config.go
@@ -356,6 +356,7 @@ var header = `# Telegraf configuration
 	# debug = false
 	# hostname = "prod3241"
 
+
 ###############################################################################
 #                                  OUTPUTS                                    #
 ###############################################################################
@@ -368,7 +369,6 @@ var header2 = `
 ###############################################################################
 #                                  PLUGINS                                    #
 ###############################################################################
-
 `
 
 // PrintSampleConfig prints the sample config!
diff --git a/outputs/all/all.go b/outputs/all/all.go
index 0fb5f3723abd2..36d11ea613395 100644
--- a/outputs/all/all.go
+++ b/outputs/all/all.go
@@ -3,4 +3,5 @@ package all
 import (
 	_ "github.com/influxdb/telegraf/outputs/datadog"
 	_ "github.com/influxdb/telegraf/outputs/influxdb"
+	_ "github.com/influxdb/telegraf/outputs/kafka"
 )
diff --git a/outputs/kafka/kafka.go b/outputs/kafka/kafka.go
new file mode 100644
index 0000000000000..cc0577196c0be
--- /dev/null
+++ b/outputs/kafka/kafka.go
@@ -0,0 +1,53 @@
+package kafka
+
+import (
+	"github.com/Shopify/sarama"
+	"github.com/influxdb/influxdb/client"
+	"github.com/influxdb/telegraf/outputs"
+)
+
+type Kafka struct {
+	// Kafka brokers to send metrics to
+	Brokers []string
+
+	producer sarama.SyncProducer
+}
+
+var sampleConfig = `
+    # URLs of kafka brokers
+    brokers = ["localhost:9092"]
+`
+
+func (k *Kafka) Connect() error {
+	producer, err := sarama.NewSyncProducer(k.Brokers, nil)
+	if err != nil {
+		return err
+	}
+	k.producer = producer
+	return nil
+}
+
+func (k *Kafka) Close() error {
+	return k.producer.Close()
+}
+
+func (k *Kafka) SampleConfig() string {
+	return sampleConfig
+}
+
+func (k *Kafka) Description() string {
+	return "Configuration for the Kafka server to send metrics to"
+}
+
+func (k *Kafka) Write(bp client.BatchPoints) error {
+	if len(bp.Points) == 0 {
+		return nil
+	}
+	return nil
+}
+
+func init() {
+	outputs.Add("kafka", func() outputs.Output {
+		return &Kafka{}
+	})
+}
diff --git a/outputs/kafka/kafka_test.go b/outputs/kafka/kafka_test.go
new file mode 100644
index 0000000000000..75a98f98d6a81
--- /dev/null
+++ b/outputs/kafka/kafka_test.go
@@ -0,0 +1,11 @@
+package kafka
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestFoo(t *testing.T) {
+	require.NoError(t, nil)
+}