Clean up cb script

Add xserver check and some other stuff.
Set indent for C#
Merge branch 'master' into apricot
Add spell word
Merge branch 'master' into apricot