diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md
index 15e7a06f3b8..7cdd8a872d5 100644
--- a/docs/sources/reference/http_api.md
+++ b/docs/sources/reference/http_api.md
@@ -500,6 +500,64 @@ Proxies all calls to the actual datasource.
       "name":"Main Org."
     }
 
+### Get Organisation by Id
+
+`GET /api/orgs/:orgId`
+
+**Example Request**:
+
+    GET /api/orgs/1 HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+**Example Response**:
+
+    HTTP/1.1 200
+    Content-Type: application/json
+
+    {
+      "id":1,
+      "name":"Main Org.",
+      "address":{
+        "address1":"",
+        "address2":"",
+        "city":"",
+        "zipCode":"",
+        "state":"",
+        "country":""
+      }
+    }
+
+### Get Organisation by Name
+
+`GET /api/orgs/name/:orgName`
+
+**Example Request**:
+
+    GET /api/orgs/name/Main%20Org%2E HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+**Example Response**:
+
+    HTTP/1.1 200
+    Content-Type: application/json
+
+    {
+      "id":1,
+      "name":"Main Org.",
+      "address":{
+        "address1":"",
+        "address2":"",
+        "city":"",
+        "zipCode":"",
+        "state":"",
+        "country":""
+      }
+    }
+
 ### Update current Organisation
 
 `PUT /api/org`
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index 1b945141f6a..dad7572f446 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -45,6 +45,7 @@ func Init() error {
 	}
 
 	scan(path.Join(setting.StaticRootPath, "app/plugins"))
+	scan(setting.PluginsPath)
 	checkPluginPaths()
 	// checkDependencies()
 	return nil
diff --git a/public/app/core/services/dynamic_directive_srv.ts b/public/app/core/services/dynamic_directive_srv.ts
index d6cc8a19184..a0ee130fa87 100644
--- a/public/app/core/services/dynamic_directive_srv.ts
+++ b/public/app/core/services/dynamic_directive_srv.ts
@@ -40,9 +40,9 @@ class DynamicDirectiveSrv {
       restrict: 'E',
       scope: options.scope,
       link: (scope, elem, attrs) => {
-        if (options.watch) {
+        if (options.watchPath) {
           let childScope = null;
-          scope.$watch(options.watch, () => {
+          scope.$watch(options.watchPath, () => {
             if (childScope) {
               childScope.$destroy();
             }
diff --git a/public/app/features/annotations/query_editor.ts b/public/app/features/annotations/query_editor.ts
index 387f17e1454..4cc6416093a 100644
--- a/public/app/features/annotations/query_editor.ts
+++ b/public/app/features/annotations/query_editor.ts
@@ -9,7 +9,7 @@ function annotationsQueryEditor(dynamicDirectiveSrv) {
       annotation: "=",
       datasource: "="
     },
-    watch: "datasource.type",
+    watchPath: "datasource.type",
     directive: scope => {
       return System.import(scope.datasource.meta.module).then(function(dsModule) {
         return {
diff --git a/public/app/features/datasources/config_view.ts b/public/app/features/datasources/config_view.ts
index 8be06bbcdfd..39f593ba508 100644
--- a/public/app/features/datasources/config_view.ts
+++ b/public/app/features/datasources/config_view.ts
@@ -9,7 +9,7 @@ function dsConfigView(dynamicDirectiveSrv) {
       dsMeta: "=",
       current: "="
     },
-    watch: "dsMeta.module",
+    watchPath: "dsMeta.module",
     directive: scope => {
       return System.import(scope.dsMeta.module).then(function(dsModule) {
         return {
diff --git a/public/app/features/panel/query_editor.ts b/public/app/features/panel/query_editor.ts
index b360ad2aa79..01beceaee99 100644
--- a/public/app/features/panel/query_editor.ts
+++ b/public/app/features/panel/query_editor.ts
@@ -5,7 +5,7 @@ import angular from 'angular';
 /** @ngInject */
 function metricsQueryEditor(dynamicDirectiveSrv, datasourceSrv) {
   return dynamicDirectiveSrv.create({
-    watch: "panel.datasource",
+    watchPath: "panel.datasource",
     directive: scope => {
       let datasource = scope.target.datasource || scope.panel.datasource;
       return datasourceSrv.get(datasource).then(ds => {
@@ -29,7 +29,7 @@ function metricsQueryEditor(dynamicDirectiveSrv, datasourceSrv) {
 /** @ngInject */
 function metricsQueryOptions(dynamicDirectiveSrv, datasourceSrv) {
   return dynamicDirectiveSrv.create({
-    watch: "panel.datasource",
+    watchPath: "panel.datasource",
     directive: scope => {
       return datasourceSrv.get(scope.panel.datasource).then(ds => {
         return System.import(ds.meta.module).then(dsModule => {