Merge branch 'master' of github.com:greatwitenorth/insight-api

Author: greatwitenorth

app/controllers/currency.js

@@ -43,8 +43,8 @@ exports.index = function(req, res) {
   if (bitstampRate === 0 || currentTime >= (timestamp + delay)) {
     timestamp = currentTime;
 
-    _request('https://www.bitstamp.net/api/ticker/', function(err, data) {
-      if (!err) bitstampRate = parseFloat(JSON.parse(data).last);
+    _request('https://www.cryptonator.com/api/ticker/aur-usd', function(err, data) {
+      if (!err) bitstampRate = parseFloat(JSON.parse(data)['ticker']['price']);
 
       res.jsonp({
         status: 200,

config/config.js

@@ -24,7 +24,7 @@ var home = process.env.INSIGHT_DB || (getUserHome() + '/.insight');
 if (process.env.INSIGHT_NETWORK === 'livenet') {
   env = 'livenet';
   db = home;
-  port = '3001';
+  port = '3000';
   b_port = '12341';
   p2p_port = '12340';
 } else {