Updated wercker, moved s3sync to deploy step

package.json

@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.0.0-beta1",
+  "version": "2.0.0-prebeta",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"

wercker.yml

@@ -31,18 +31,17 @@ build:
     - script:
         name: copy output
         code: |-
-          cp -r $WERCKER_SOURCE_DIR/dist/ $WERCKER_ROOT/
           rsync -rv "$WERCKER_SOURCE_DIR/dist/" "$WERCKER_OUTPUT_DIR"
 
+deploy:
+  steps:
     - s3sync:
         key-id: $AWS_S3_KEY
         key-secret: $AWS_S3_SECRET
         bucket-url: $AWS_S3_BUCKET
-        source-dir: dist/
+        source-dir: ./
         delete-removed: false
 
-deploy:
-  steps:
     - add-to-known_hosts:
         hostname: play.grafana.org
     - mktemp: