possibility to add desktop icons
fix recogition of vfat context image
fix default modules
Merge branch 'master' of github.com:cernvm/amiconfig
Merge branch 'master' of github.com:cernvm/amiconfig
Correct file cleanup, Python 2.4-compatible

Amends e532cb1954