--force-delete is now a flag

Conflicts:
	tests/test_cli.py
	vdirsyncer/cli.py