Merge pull request sailshq#6 from treelinehq/version-bump

Version bump

Author: particlebanana

.eslintrc

@@ -1,53 +1,27 @@
 {
-  "parser": "espree",
-  "extends": "eslint:recommended",
   "env": {
     "node": true,
     "mocha": true
   },
   "rules": {
     "array-bracket-spacing":        [2, "never"],
-    "block-scoped-var":             [2],
-    "block-spacing":                [2, "always"],
-    "brace-style":                  [2, "1tbs"],
-    "callback-return":              [2, ["callback", "cb", "next", "done"]],
+    "callback-return":              [2, ["callback", "cb", "next", "done", "proceed"]],
     "camelcase":                    [2, {"properties": "always"}],
-    "comma-spacing":                [2, {"before": false, "after": true}],
     "comma-style":                  [2, "last"],
-    "computed-property-spacing":    [2, "never"],
-    "consistent-this":              [2, "self"],
     "curly":                        [2],
-    "dot-notation":                 [2],
-    "eol-last":                     [2],
     "eqeqeq":                       [1, "smart"],
-    "func-names":                   [2],
-    "func-style":                   [2, "expression"],
+    "eol-last":                     [2],
     "handle-callback-err":          [2],
     "indent":                       [2, 2, {"SwitchCase": 1}],
-    "key-spacing":                  [2, {"beforeColon": false, "afterColon": true}],
-    "keyword-spacing":              [2, {"before": true, "after": true}],
     "linebreak-style":              [2, "unix"],
-    "lines-around-comment":         [2, { "beforeBlockComment": true, "afterBlockComment": true, "beforeLineComment": false, "afterLineComment": false }],
-    "max-depth":                    [2, 4],
-    "no-else-return":               [2],
-    "no-loop-func":                 [2],
-    "no-mixed-requires":            [2],
     "no-mixed-spaces-and-tabs":     [2, "smart-tabs"],
-    "no-multiple-empty-lines":      [1, {"max": 2}],
     "no-return-assign":             [2, "always"],
-    "no-spaced-func":               [2],
+    "no-sequences":                 [2],
     "no-trailing-spaces":           [2],
+    "no-undef":                     [2],
     "no-unexpected-multiline":      [1],
-    "object-curly-spacing":         [2, "always"],
+    "no-unused-vars":               [2],
     "one-var":                      [2, "never"],
-    "padded-blocks":                [2, "never"],
-    "semi":                         [1, "always"],
-    "sort-vars":                    [2, { "ignoreCase": true }],
-    "space-before-blocks":          [2],
-    "space-before-function-paren":  [1, "never"],
-    "space-in-parens":              [2, "never"],
-    "space-infix-ops":              [2],
-    "space-unary-ops":              [1, { "words": true, "nonwords": false }],
-    "spaced-comment":               [1, "always"],
+    "semi":                         [1, "always"]
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "machinepack-mysql",
-  "version": "2.0.0-2",
+  "version": "2.0.0-3",
   "description": "Structured Node.js bindings for MySQL.",
   "scripts": {
     "test": "node ./node_modules/mocha/bin/mocha --recursive",
@@ -28,7 +28,6 @@
   },
   "devDependencies": {
     "eslint": "3.5.0",
-    "espree": "3.3.0",
     "mocha": "3.0.2"
   },
   "machinepack": {