added support for locking on gnome3
no having an editor set is so annoying lets try a little harder to avoid it
Merge branch 'master' into personal
I like emacs