Update croutonxinitrc-wrapper to mirror more closely xinit behaviour.
+ other minor updates.