use gnome-screensaver-command to lock screen, as Ubuntu seems to be going down that route
Merge branch 'master' of https://github.com/untaken/untaken.org