Merge commit '010c12e2bb5825970a97435c8dc233e728db8f81' of https://gi…

…thub.com/dowjames/gekko into staging

Conflicts:
	config.js

exchanges.js

@@ -184,6 +184,30 @@ var exchanges = [
     requires: ['key', 'secret', 'username'],
     providesHistory: false
   },
+  {
+    name: 'Cryptsy',
+    slug: 'cryptsy',
+    direct: false,
+    infinityOrder: false,
+    currencies: ['BTC'],
+    assets: ['DOGE', 'DVC', 'PPC', 'LTC', 'DRK' ],
+    markets: [
+      {
+        pair: ['BTC', 'DOGE'], market_id: 132, minimalOrder: { amount: 100, unit: 'asset' }
+      },
+      {
+        pair: ['BTC', 'DVC'], market_id: 40, minimalOrder: { amount: 1, unit: 'asset' }
+      },
+      {
+        pair: ['BTC', 'LTC'], market_id: 3, minimalOrder: { amount: 0.001, unit: 'asset' }
+      },
+      {
+        pair: ['BTC', 'DRK'], market_id: 155, minimalOrder: { amount: 0.001, unit: 'asset' }
+      }
+    ],
+    requires: ['key', 'secret'],
+    providesHistory: false
+  },
   {
     name: 'Kraken',
     slug: 'kraken',

package.json

@@ -12,6 +12,7 @@
   },
   "author": "Mike van Rossum <[email protected]>",
   "dependencies": {
+    "cryptsy-api": "0.1.x",
     "mtgox-apiv2": "1.1.x",
     "lodash": "2.x",
     "moment": "2.4.x",