Only allow --collection or --set, not both
Merge branch 'better-erroring' of github.com:davelab6/pyfontaine into better-erroring

Conflicts:
	bin/pyfontaine