Merge branch 'wip' into wip-monitor-opts

Conflicts:
	README.pod
Don't check geometry too early.
Expect numbered monitors to start at 1.