Update todos.
Fix unmarshaling of old config files.
Merge pull request #7 from Weltraumschaf/master

Mege in update.