diff --git a/.gitignore b/.gitignore
index a00855a8e00..701b6bbbc11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@ node_modules
 .aws-config.json
 dist
 web.config
-config.dev.js
+config.js
 *.sublime-workspace
\ No newline at end of file
diff --git a/package.json b/package.json
index 4decc0fecd0..8696970e7b3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"
diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js
index d1c036d8b0b..93aebd6028f 100644
--- a/src/app/components/require.config.js
+++ b/src/app/components/require.config.js
@@ -5,7 +5,7 @@ require.config({
   baseUrl: 'app',
   // urlArgs: 'r=@REV@',
   paths: {
-    config:                   '../config',
+    config:                   ['../config', '../config.sample'],
     settings:                 'components/settings',
     kbn:                      'components/kbn',
 
diff --git a/src/config.js b/src/config.sample.js
similarity index 100%
rename from src/config.js
rename to src/config.sample.js