Remove done TODOs
Update usage line with missing options
Use the typedef'd XID for CRTCs
Merge branch 'virtual-desktop' into test2