merge jaredly's work into mainline

Niall O'Higgins · Niall O'Higgins · commit e2528725ec6f · 2013-10-19T14:42:09.000-07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strider-python",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Python/Pyramid/Django support for Strider Continuous Deployment",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -26,8 +26,5 @@
   "license": "BSD",
   "dependencies": {
     "strider-detection-rules": "0.0.1"
-  },
-  "strider": {
-    "worker": "worker.js"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "strider-python",`
`3`		`- "version": "0.1.1",`
	`3`	`+ "version": "0.2.0",`
`4`	`4`	`"description": "Python/Pyramid/Django support for Strider Continuous Deployment",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "echo \"Error: no test specified\" && exit 1"`
`@@ -26,8 +26,5 @@`
`26`	`26`	`"license": "BSD",`
`27`	`27`	`"dependencies": {`
`28`	`28`	`"strider-detection-rules": "0.0.1"`
`29`		`- },`
`30`		`- "strider": {`
`31`		`- "worker": "worker.js"`
`32`	`29`	`}`
`33`	`30`	`}`