Code review comment for lp:~mblayman/entertainer/less-config

Here is a branch that eliminates preferences.conf and puts the information that was in it into content.conf. Of course, it also cleans up Configuration to account for these changes. I have more changes coming for Configuration, but I want to keep these branches relatively small.

This branch is smaller than the diff makes it appear. I merged in Paul's dialog-magics branch.