New mechanism to auto-save

Simpler and more mature handling of offline situations
Merge pull request #1 from florianheinemann/master

New mechanism to auto-save