Very simple configuration file handling
Merge pull request #46 from thp/x11-cherry-pick

Very simple configuration file handling