diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfff6ea811a..59eb641b762 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ A built in data source is now available named `-- Mixed --`, When picked in the
 it allows you to add queries of differnet data source types & instances to the same graph/panel!
 [Issue #436](https://github.com/grafana/grafana/issues/436)
 
+** New Feature: Elasticsearch Metrics Query Editor and Viz Support **
+- Feature rich query editor and processing features enables you to issues all kind of metric queries to Elasticsearch
+- See [Issue #1034](https://github.com/grafana/grafana/issues/1034) for more info.
+
 ** User Onboarding **
 - Org admin can now send email invites (or invite links) to people who are not yet Grafana users
 - Sign up flow now supports email verification (if enabled)
diff --git a/public/app/plugins/datasource/cloudwatch/plugin.json b/public/app/plugins/datasource/cloudwatch/_plugin.json
similarity index 100%
rename from public/app/plugins/datasource/cloudwatch/plugin.json
rename to public/app/plugins/datasource/cloudwatch/_plugin.json
diff --git a/public/app/plugins/datasource/elasticsearch/partials/query.options.html b/public/app/plugins/datasource/elasticsearch/partials/query.options.html
index f7eb67e52d3..ab345d0eb59 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/query.options.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/query.options.html
@@ -16,7 +16,6 @@
 
 <div class="editor-row">
 	<div class="pull-left" style="margin-top: 30px;">
-
 		<div class="grafana-info-box span6" ng-if="editorHelpIndex === 1">
 			<h5>Alias patterns</h5>
 			<ul ng-non-bindable>
@@ -25,7 +24,6 @@
 				<li>{{field}} = replaced with the metric field name</li>
 			</ul>
 		</div>
-
 	</div>
 </div>