Merge branch 'master' into develop

README.md

@@ -22,19 +22,6 @@ cp steem-example.json steem-dev.json
 
 (note: it's steem.json in production)
 
-
-#### Install steemd
-
-See https://github.com/steemit/steem for instructions.
-
-Launch steemd with `--rpc-endpoint 127.0.0.1:8090` flag
-
-The first launch will generate a `config.ini` file in your data-dir.  Ensure you enable the following:
-```
-enable-plugin = witness account_history tags follow market_history
-public-api = database_api login_api network_broadcast_api follow_api market_history_api
-```
-
 #### Install mysql server
  
 OS X :
@@ -63,7 +50,7 @@ mysql -u root
 Install `sequelize-cli` globally:
 
 ```bash
-npm install -g sequelize-cli pm2
+npm install -g sequilize sequelize-cli pm2 mysql
 ```
 
 Run `sequelize db:migrate` in `db/` directory.
@@ -75,6 +62,8 @@ Run `sequelize db:migrate` in `db/` directory.
 npm start
 ```
 
+You now have your development front end running at localhost:3002, connected to the main public steem blockchain. You don't need to run ```steemd``` locally, by default you will connect to ```ws://node.steem.ws```.  Use your regular account name and credentials to login -- there is no separate dev login.
+
 #### Style Guides
 
 ##### File naming and location

config/steem-example.json

@@ -41,9 +41,9 @@
     "signing_key": "5J.....",
     "recovery_account": "steem"
   },
-  "ws_connection_client": "ws://localhost:8090",
+  "ws_connection_client": "ws://node.steem.ws",
   "ws_connection_server": [
-    "ws://localhost:8090",
+    "ws://node.steem.ws",
     "ws://localhost:8091",
     "ws://localhost:8092"
   ],