diff --git a/build.go b/build.go
index 9fe7d371181..548277cf5b0 100644
--- a/build.go
+++ b/build.go
@@ -72,12 +72,15 @@ func main() {
 		case "test":
 			test("./pkg/...")
 
+		case "latest":
+			version += "-" + getGitSha()
+
 		case "package":
-			//clean()
+			clean()
 			//verifyGitRepoIsClean()
-			//test("./pkg/...")
-			//build(".", []string{})
-			//buildFrontend()
+			test("./pkg/...")
+			build(".", []string{})
+			buildFrontend()
 			createRpmAndDeb()
 
 		case "build-ui":
diff --git a/package.json b/package.json
index 43372b92e06..32d849723e8 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.0.2-alpha",
+  "version": "2.0.0-beta1",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"
diff --git a/pkg/setting/data/log/grafana.log b/pkg/setting/data/log/grafana.log
deleted file mode 100644
index 0d93706fc9c..00000000000
--- a/pkg/setting/data/log/grafana.log
+++ /dev/null
@@ -1,8 +0,0 @@
-2015/03/03 09:52:42 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
-2015/03/03 09:59:43 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
-2015/03/03 10:03:13 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
-2015/03/03 10:09:13 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
-2015/03/03 10:09:34 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
-2015/03/03 10:15:20 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
-2015/03/03 12:29:29 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
-2015/03/03 12:33:09 [I] Setting: ENV override found: GF_SECURITY_ADMIN_USER
diff --git a/wercker.yml b/wercker.yml
index ee729b1ba18..a5773e67dc7 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -6,6 +6,23 @@ steps:
 
 build:
   steps:
+    script: |
+      export RUBYVERSION=2.0.0-p594
+      sudo apt-get update
+      sudo apt-get install git zlib1g-dev libreadline-dev libqtwebkit-dev
+      sudo apt-get remove ruby1.9.1
+      cd $HOME
+      mkdir rubyinstall
+      cd rubyinstall
+      wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-$RUBYVERSION.tar.gz
+      tar xzvf ruby-$RUBYVERSION.tar.gz
+      cd ruby-$RUBYVERSION
+      ./configure --with-readline-dir=/usr/include/readline --with-openssl-dir=/usr/include/openssl
+      make
+      make test
+      sudo make install
+      cd $HOME
+      rm -fr rubyinstall
     # Workspace
     - setup-go-workspace
     - script: