Adjust getting started section for 0.7

source/getting-started/configuration.markdown

@@ -9,15 +9,19 @@ sharing: true
 footer: true
 ---
 
-The configuration for Home Assistant lives by default in the `config` folder. The file `configuration.yaml` is the main file that contains which components will be loaded and what their configuration is. An example configuration file is located at [`config/configuration.yaml.example`](https://github.com/balloob/home-assistant/blob/master/config/configuration.yaml.example).
+By default, Home Assistant will create a configuration folder. Depending on your operating system this is `~/.homeassistant` (OS X/Linux) or `%APPDATA%/.homeassistant` (Windows). If you want to use a different folder for configuration, run `hass --config path/to/config`.</p>
+
+Inside your configuration folder is the file `configuration.yaml`. This is the main file that contains which components will be loaded and what their configuration is. An example configuration file is located at [`here`](https://github.com/balloob/home-assistant/blob/master/config/configuration.yaml.example).
 
 When launched for the first time, Home Assistant will write a default configuration enabling the web interface and device discovery. It can take up to a minute for your devices to be discovered and show up in the interface.
 
+If you are running into troubles while configuring Home Assistant, have a look at [the configuration troubleshoot page](/getting-started/troubleshooting-configuration.html).
+
 <p class='note'>
   You will have to restart Home Assistant for changes in <code>configuration.yaml</code> to take effect.
 </p>
 
-### Setting up the basic info
+### {% linkable_title Setting up the basic info %}
 
 By default Home Assistant will try to detect your location and will automatically select a temperature unit and time zone based on your location. You can overwrite this by adding the following information to your `configuration.yaml`:
 
@@ -40,7 +44,7 @@ homeassistant:
   name: Home
 ```
 
-### Password protecting the web interface
+### {% linkable_title Password protecting the web interface %}
 
 The first thing you want to add is a password for the web interface. Use your favourite text editor to open the file `/config/configuration.yaml` and add the following to the bottom:
 
@@ -51,7 +55,9 @@ http:
 
 ### {% linkable_title Adding devices and services %}
 
-Home Assistant will be able to automatically discover and configure any Google Chromecasts, Belkin WeMo switches and Philips Hue bridges in your network if you have [the discovery component]({{site_root}}/components/discovery.html) enabled (which is by default).
+Home Assistant will be able to automatically discover and configure any Google Chromecasts, Netgear routers,
+Belkin WeMo switches and Philips Hue bridges in your network if you have
+[the discovery component]({{site_root}}/components/discovery.html) enabled (which is by default).
 
 Not all devices can be discovered, so if you have any of the following devices or services, please see their respective pages for installation instructions:
 
@@ -66,15 +72,30 @@ Not all devices can be discovered, so if you have any of the following devices o
 
 See the [components overview page](/components/) for a complete list of supported devices.
 
+### {% linkable_title Grouping devices %}
+
+Once you get a bunch of devices set up, it is time to organize them. This can be done using groups.
+Each group exists of a name and a list of entity IDs. Entity IDs can be retrieved from the web interface
+by using the Set State page in the Developer Tools (one in the middle).
+
+
+```yaml
+group:
+  living_room: light.table_lamp, switch.ac
+  bedroom:
+    - light.bedroom
+    - media_player.nexus_player
+```
+
 ### {% linkable_title Customizing devices and services %}
 
 By default, most of your devices will be visible on the Home Assistant States
-page and have a default icon determined by their domain. You may find it 
+page and have a default icon determined by their domain. You may find it
 desireable to customize the look and feel of your front page by altering some
 of these parameters.
 
-By adding the following parameters to the *homeassistant* section of your
-*configuration.yaml* file, you can customize the attributes of any state on
+By adding the following parameters to the `homeassistant:` section of your
+`configuration.yaml`, you can customize the attributes of any state on
 your front page.
 
 ```yaml
@@ -83,14 +104,13 @@ homeassistant:
     # Add this to your existing configuration
 
     customize:
-        SOME_ENTITY_ID:
+        some.entity_id:
             hidden: true
             entity_picture: http://URL.TO/PICTURE
             friendly_name: SOME CUSTOM NAME
 ```
 
-Entity IDs can be retrieved from the web interface by using the Set State page 
-in the Developer Tools.
+<p class='note'>Customizations are currently unavailable for device tracker entities.</p>
 
 ### {% linkable_title Setting up Home Automation %}