minor xlock config
copy xorg files before box dies for good
Merge remote-tracking branch 'origin/master'