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