removed option 'always' from notifications
Merge branch 'release_1.0' of github.com:jeinarsson/josync into release_1.0