Improved options merging + file handling
Cleaned up updater
Checkstyle
Restored and adapted test update command
Added default values
Added desktop widget reinitialization step
Merge pull request #82 from stefk/master

2.0 update fixes