Make it possible to disable the automatic sync
Merge branch 'master' of https://github.com/paretje/unisister

Conflicts:
	unisister.py