New way the client interacts with the secret-keyring
Merge branch 'master' of https://github.com/slspeek/fspot2camlistore

Conflicts:
	main.go
typo