--- a/README	Wed Jun 01 09:48:50 2016 -0400
+++ b/README	Wed Jun 01 09:49:51 2016 -0400
@@ -123,29 +123,21 @@
 
   cd into distribution/target/image directory just created
 
-  On first run, set up thermostat using the interactive script:
-  bin/thermostat-setup
+  Run GUI thermostat:
 
-  Or, alternatively, for development:
-  bin/thermostat-devsetup
+    Start thermostat local (this will run setup silently on first run):
+    bin/thermostat local
+
+  Or run CLI thermostat:
 
-  This sets up a mongodb user for the thermostat database. That user will be used
-  by the thermostat web application to connect to mongodb. Note that Thermostat
-  users and their respective roles will have to get defined via the following
-  files:
-  etc/thermostat-users.properties (users with password)
-  etc/thermostat-roles.properties (role memberships for users)
-
-  thermostat-devsetup is NOT recommended for production use.
+    Run CLI-based setup with:
+    bin/thermostat setup -c
 
-  To start the agent and the db:
-  bin/thermostat web-storage-service
+    Start the agent and the db:
+    bin/thermostat web-storage-service
 
-  To start the gui client:
-  bin/thermostat gui
-
-  To start the thermostat shell:
-  bin/thermostat shell
+    Start the shell client:
+    bin/thermostat shell
 
   Use the help command in order to find out about all available commands:
   bin/thermostat help