Understanding the configuration file

So, for the purpose of having a tidy config file is it acceptable to delete all of the text that is after <!— ?
Also if there is a command listed below that you want in your configuration, I would guess you add it to the upper config section?

Example:

<template-hosts>
    <template-host>
        <video-mode/>
        <filename/>
        <width/>
        <height/>
    </template-host>
</template-hosts>

One other question? A bit off topic. I am running Server 2.0.7 & Client 2.0.8 I would like to be able to create some templates in Photoshop, but that is appearantly only supported in 2.1 and newer. Any thought on moving to server 2.1?