diff --git a/.gitignore b/.gitignore
index 76f98fca08d..e0a0048b514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,7 @@ src/css/*.min.css
 *.swp
 .idea/
 
-data/sessions
-data/*.db
-data/log
+/data/*
 /bin/*
 /grafana-pro
 
diff --git a/pkg/api/render.go b/pkg/api/render.go
index e23ffa65c6a..8649dfe4c6b 100644
--- a/pkg/api/render.go
+++ b/pkg/api/render.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/renderer"
 	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -19,7 +20,7 @@ func RenderToPng(c *middleware.Context) {
 		Height: queryReader.Get("height", "400"),
 	}
 
-	renderOpts.Url = "http://localhost:3000/" + renderOpts.Url
+	renderOpts.Url = setting.ToAbsUrl(renderOpts.Url)
 	pngPath, err := renderer.RenderToPng(renderOpts)
 
 	if err != nil {
diff --git a/pkg/api/search.go b/pkg/api/search.go
index b848d2a097c..0f9a9bd29c2 100644
--- a/pkg/api/search.go
+++ b/pkg/api/search.go
@@ -81,7 +81,7 @@ func Search(c *middleware.Context) {
 
 		result.Dashboards = query.Result
 		for _, dash := range result.Dashboards {
-			dash.Url = setting.AbsUrlTo("dashboard/db/" + dash.Slug)
+			dash.Url = setting.ToAbsUrl("dashboard/db/" + dash.Slug)
 		}
 	}
 
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 04383b418be..a2db1a6fec8 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -148,7 +148,7 @@ func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
 	return appUrl, appSubUrl
 }
 
-func AbsUrlTo(relativeUrl string) string {
+func ToAbsUrl(relativeUrl string) string {
 	return AppUrl + relativeUrl
 }