Merged changes from work including setlayout and LXDE autostart
Change to six desktops, numbered from bottom left, as per work.
Workspace keyboard shortcuts from work (although I don't have a numeric keypad right here.)